diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 7dc56a60..ab45c23e 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -12,4 +12,5 @@ Other recommendations:
 - A website to help you format new entries is available at https://n8225.github.io/
 - The list of contributors can be updated with `make contrib`. 
 - Software with no development activity for 6-12 months may be removed from the list.
+- Don't know where to start? Check issues labeled [`help wanted`](https://github.com/Kickball/awesome-selfhosted/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) and [`fix`](https://github.com/Kickball/awesome-selfhosted/issues?q=is%3Aissue+is%3Aopen+label%3Afix).
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 83d5bda1..30b4cba5 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -21,7 +21,7 @@ Non-free software in `non-free.md`:
 - [ ] Your additions are not already listed at [awesome-sysadmin](https://github.com/n1trux/awesome-sysadmin) (IT infrastructure management), [staticgen.com](https://www.staticgen.com/) or [staticsitegenerators.net](https://staticsitegenerators.net/) (static site generators).
 - [ ] Your additions have their `License` main server-side `Language`/platform/requirement listed.
 - [ ] Any licenses you have added are in our [list of licenses](https://github.com/Kickball/awesome-selfhosted/blob/master/README.md#list-of-licenses).
-- [ ] You have searched the repository for any relevant [issues](https://github.com/Kickball/awesome-selfhosted/issues) or [PRs](https://github.com/Kickball/awesome-selfhosted/pulls), incluing closed ones.
+- [ ] You have searched the repository for any relevant [issues](https://github.com/Kickball/awesome-selfhosted/issues) or [PRs](https://github.com/Kickball/awesome-selfhosted/pulls), including closed ones.
 - [ ] If the main link of your addition points to the program's source code, there is no need to add a duplicate _Source Code_ link. The _Demo_ and _Clients_ links are not mandatory.
 - [ ] Any category you are creating has the minimum requirement of 3 items. If not, your addition may be inserted into `Misc/Other`.
 - [ ] Any software project you are adding to the list is actively maintained.
diff --git a/.travis.yml b/.travis.yml
index a6c8cbd5..9fce5d1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ node_js:
   - "node"
 
 before_install:
-  - rvm install 2.2
+  - rvm install 2.6.2
   - gem install awesome_bot
   - gem install danger
 
diff --git a/AUTHORS.md b/AUTHORS.md
index 1a69a53e..377e7b12 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -1,8 +1,8 @@
 |Commits | Author |
 | :---: | --- |
-|733|nodiscc <nodiscc@gmail.com>|
-|312|Kickball <ed.kickball@hotmail.com>|
-|188|n8225 <n8225@users.noreply.github.com>|
+|803|nodiscc <nodiscc@gmail.com>|
+|319|Kickball <ed.kickball@hotmail.com>|
+|209|n8225 <n8225@users.noreply.github.com>|
 |122|Andrew Rylatt <arylatt@users.noreply.github.com>|
 |35|Kovah <mail@kovah.de>|
 |31|DJCrashdummy <DJCrashdummy@users.noreply.github.com>|
@@ -17,6 +17,7 @@
 |9|Andrew Peng <pengc99@gmail.com>|
 |9|Joubert RedRat <eu+github@redrat.com.br>|
 |9|Lance M <mightyfree@users.noreply.github.com>|
+|9|cave <cavebeat@users.noreply.github.com>|
 |8|CooperBarrett <anthony.lhuissier@openmailbox.org>|
 |8|Nick Busey <NickBusey@users.noreply.github.com>|
 |8|Pietro Marangon <pietro.marangon@gmail.com>|
@@ -28,7 +29,6 @@
 |6|Per Guth <mail@perguth.de>|
 |6|Quinn Comendant <quinn@strangecode.com>|
 |6|Touhid Arastu <touhid.arastu@gmail.com>|
-|6|cave <cavebeat@users.noreply.github.com>|
 |5|James Cole <JC5@users.noreply.github.com>|
 |5|Jean Champémont <jchampemont@users.noreply.github.com>|
 |5|Karl Coelho <karl.coelho1@gmail.com>|
@@ -46,6 +46,7 @@
 |4|Aravindo Wingeier <synox@users.noreply.github.com>|
 |4|Arda Kılıçdağı <ardakilicdagi@gmail.com>|
 |4|Chris McCormick <chris@mccormick.cx>|
+|4|Christian Bayer <cave@cavebeat.org>|
 |4|Cody Heimberger <cody.heimberger@printerlogic.com>|
 |4|Colin Pokowitz <colin@cpdev.me>|
 |4|Colin Pokowitz <colinpokowitz03@gmail.com>|
@@ -60,16 +61,19 @@
 |4|Jean Elchinger <jinformatique@riseup.net>|
 |4|Joery Zegers <accounts@jzegers.nl>|
 |4|Johannes Zellner <johannes@nebulon.de>|
+|4|Jorge E. Gomez <jorge@jorgee.net>|
 |4|Joshua Westerheide <dev@jdoubleu.de>|
 |4|MK <kohenkatz@gmail.com>|
 |4|Marius Voila <marius.voila@gmail.com>|
 |4|Rodolfo Berrios <inbox@rodolfoberrios.com>|
+|4|Sebastian Stehle <sebastian@squidex.io>|
 |4|Tony <goofballtech@gmail.com>|
 |4|Valmik <mail@valmik.in>|
 |4|bysslord <wxwlegend@gmail.com>|
 |4|dattaz <taz@dattaz.fr>|
 |4|dpfaffenbauer <dominik@lineofcode.at>|
 |4|dyu <david.yu.ftw@gmail.com>|
+|4|hebbet <pascal.herbert@gmail.com>|
 |4|paddo <mail@patrickrichter.net>|
 |3|Aguay <baraise.valentin@gmail.com>|
 |3|Akhyar Amarullah <akhyrul@gmail.com>|
@@ -78,9 +82,12 @@
 |3|Burak Emre Kabakcı <emrekabakci@gmail.com>|
 |3|Conor O'Callaghan <brioscaibriste@users.noreply.github.com>|
 |3|Cédric Krier <cedk@users.noreply.github.com>|
+|3|Daniel Mason <danielmason@catalyst.net.nz>|
 |3|Danja Vasiliev <danja@k0a1a.net>|
+|3|Erik <erikhubers@users.noreply.github.com>|
 |3|Ethan Lowman <ethanal@users.noreply.github.com>|
 |3|FoxMaSk <foxmask@users.noreply.github.com>|
+|3|François-Xavier Lyonnet du Moutier <fx.du.moutier@gmail.com>|
 |3|Gabin <hello@gabinaureche.com>|
 |3|Garrett Martin <me@garrettqmartin.com>|
 |3|George C. Privon <privong@users.noreply.github.com>|
@@ -106,10 +113,11 @@
 |3|Pierre Blanes <inattendu@users.noreply.github.com>|
 |3|Pierre Tinard <Edraens@users.noreply.github.com>|
 |3|Ryan DeShone <rfdeshon@gmail.com>|
+|3|Sergio Brighenti <sergio@brighenti.me>|
 |3|Tobi Schäfer <interface@p3k.org>|
 |3|Yann Forget <forget.yann31@gmail.com>|
 |3|Ye Lin Aung <me@yelinaung.com>|
-|3|hebbet <pascal.herbert@gmail.com>|
+|3|icterine <account@caravat.e4ward.com>|
 |3|jungle-boogie <sean@rastasean.net>|
 |3|moba <moba@users.noreply.github.com>|
 |3|oknozor <paul.delafosse@protonmail.com>|
@@ -117,12 +125,16 @@
 |3|rett gerst <rettgerst@users.noreply.github.com>|
 |3|xBytez <git@xbytez.io>|
 |2|A. Cynic <chris@mretc.net>|
+|2|Aditya Nagla <me@imadityang.xyz>|
 |2|Adminrezo (Nico Dewaele) <nico@adminrezo.fr>|
 |2|Albert Cervera i Areny <albert@nan-tic.com>|
+|2|Alex Bogdanovski <alex@erudika.com>|
 |2|Alexander Ryzhov <gtihub@ryzhov-al.ru>|
 |2|Alexis Metaireau <alexis@notmyidea.org>|
+|2|Amos <amos@amosarts.com>|
 |2|Andrei Poenaru <andrei.poenaru@gmail.com>|
 |2|Andrew Hayworth <hayworth@meraki.net>|
+|2|Andrew Rabert <ar@nullsum.net>|
 |2|Arik Fraimovich <arik@arikfr.com>|
 |2|Bartłomiej Kurzeja <B3QL@users.noreply.github.com>|
 |2|Ben Yanke <ben@benyanke.com>|
@@ -148,37 +160,42 @@
 |2|Felix Bartels <felix@host-consultants.de>|
 |2|Gabin Aureche <gabin.aureche@live.fr>|
 |2|Gabriel Cossette <gabriel.cossette@gmail.com>|
+|2|Gleb Mazovetskiy <glex.spb@gmail.com>|
 |2|Gonçalo Valério <dethos@users.noreply.github.com>|
 |2|Greg Slepak <contact@taoeffect.com>|
 |2|Greg V <greg@unrelenting.technology>|
 |2|Henry Ruhs <info@redaxmedia.com>|
 |2|Hilmi Tolga Sahin <htolgasahin@gmail.com>|
 |2|Jake Breindel <j.breindel2@outlook.com>|
+|2|Jake Jarvis <jakejarvis@gmail.com>|
 |2|James Cole <thegrumpydictator@gmail.com>|
 |2|Jan <jaltek@users.noreply.github.com>|
 |2|Jan Soendermann <jan.soendermann+git@gmail.com>|
 |2|Jared Shields <jwshields2006@hotmail.com>|
 |2|Jonas L <jooola@users.noreply.github.com>|
-|2|Jorge E. Gomez <jorge@jorgee.net>|
 |2|Joseph Dykstra <josephdykstra@gmail.com>|
 |2|Julien Bisconti <veggiemonk@users.noreply.github.com>|
 |2|Jérémie Astori <jeremie@astori.fr>|
 |2|Keith Thibodeaux <kthibodeaux@peachtreebilling.com>|
 |2|Kevin Vandenborne <kevin.vandenborne@gmail.com>|
 |2|Klaus-Uwe Mitterer <info@klaus-uwe.me>|
+|2|Liam Demafelix <hello@liam.ph>|
 |2|Madhu GB <github@madhugb.com>|
 |2|Malte Kiefer <malte.kiefer@mailgermania.de>|
+|2|Manuel Uberti <manuel-uberti@users.noreply.github.com>|
 |2|Marc Laporte <marc@laporte.name>|
 |2|Marien Fressinaud <dev@marienfressinaud.fr>|
 |2|Markus M. Deuerlein <mdeuerlein@users.noreply.github.com>|
 |2|MarkusMcNugen <marknewton5@gmail.com>|
 |2|Martijn <mrtijn@riseup.net>|
 |2|Massimo Santini <massimo.santini@gmail.com>|
+|2|Mats Estensen <mats.est@gmail.com>|
 |2|Matt Hazinski <matt@matthazinski.com>|
 |2|Matthieu Aubry <matt@piwik.org>|
 |2|Michael Tunnell <MichaelTunnell@users.noreply.github.com>|
 |2|Mikael Peigney <Mika56@users.noreply.github.com>|
 |2|Murali Govardhana <murali.govardhana@gmail.com>|
+|2|Nehal Hasnayeen <searching.nehal@gmail.com>|
 |2|Nicolas Carlier <n.carlier@nunux.org>|
 |2|Oliver Giles <ohw.giles@gmail.com>|
 |2|Patrik Ragnarsson <patrik@starkast.net>|
@@ -198,6 +215,7 @@
 |2|Ryan Mulligan <ryan@ryantm.com>|
 |2|Sam Tuke <mail@samtuke.com>|
 |2|Sameer Al-Sakran <salsakran@users.noreply.github.com>|
+|2|Sandeep S <ghostpirate@users.noreply.github.com>|
 |2|Shane Cooke <shanecooke@mac.com>|
 |2|Simon Vieille <simon@deblan.fr>|
 |2|Simone Grignola <sito@grignola.ch>|
@@ -221,11 +239,12 @@
 |2|cornerot <cornerot@gmail.com>|
 |2|cron410 <cron410@gmail.com>|
 |2|digiou <digitalbckp@gmail.com>|
+|2|emeric <itmfr@yahoo.fr>|
 |2|erdihu <erdihu@users.noreply.github.com>|
 |2|fengshaun <amoradi@fedoraproject.org>|
 |2|fuerbringer <severin@protonmail.ch>|
 |2|gseva <gavrilovseva@gmail.com>|
-|2|icterine <account@caravat.e4ward.com>|
+|2|jciskey <jciskey@gmail.com>|
 |2|jganobsik <39414138+jganobsik@users.noreply.github.com>|
 |2|jimykk <JimyKK@users.noreply.github.com>|
 |2|markkrj <markkrj@users.noreply.github.com>|
@@ -239,12 +258,14 @@
 |2|ziλa sarikaya <sarikayaziya@gmail.com>|
 |2|znegva <znegva@users.noreply.github.com>|
 |2|王可森 <wangkesen@users.noreply.github.com>|
+|1|132ikl <132@ikl.sh>|
+|1|4oo4 <4oo4@users.noreply.github.com>|
+|1|Aaron <44198148+whalehub@users.noreply.github.com>|
 |1|Adam C <39806482+adam-redcort@users.noreply.github.com>|
 |1|Adam Johnson <me@adamj.eu>|
 |1|Akos Veres <veres@akos.me>|
 |1|Alashov Berkeli <yunus.alashow@gmail.com>|
 |1|Alejandro Rodríguez <arcxyz@users.noreply.github.com>|
-|1|Alex Bogdanovski <alex@erudika.com>|
 |1|Alex Fornuto <alex@fornuto.com>|
 |1|Alex Yumashev <33555768+alex-jitbit@users.noreply.github.com>|
 |1|Alexandr Nesterenko <kuchaspama@gmail.com>|
@@ -257,14 +278,16 @@
 |1|Andrew Murray <radarhere@gmail.com>|
 |1|Andrew Nesbitt <andrewnez@gmail.com>|
 |1|Andrew Prokhorenkov <andrew.prokhorenkov@gmail.com>|
-|1|Andrew Rabert <ar@nullsum.net>|
 |1|Andrey <andrey200964@yandex.ru>|
 |1|Andrey Kuznetsov <fear@loathing.in>|
 |1|André Rodier <arodier@users.noreply.github.com>|
 |1|Andy Olsen <andrewolsen@mail.adelphi.edu>|
+|1|Andyyyyy94 <Andyyyyy94@users.noreply.github.com>|
 |1|Angel Velasquez <angvp@archlinux.org>|
 |1|Antoine <anthonyfg9@gmail.com>|
+|1|Antoine Gersant <antoine.gersant@lesforges.org>|
 |1|Anton Troyanov <anton@troyanov.net>|
+|1|Arkady Asuratov <arkady.asuratov@dubas.pro>|
 |1|Armando Lüscher <armando@noplanman.ch>|
 |1|Arnold Schrijver <aschrijver@users.noreply.github.com>|
 |1|ArthurHoaro <arthur@hoa.ro>|
@@ -278,6 +301,7 @@
 |1|Brett <brettex@hotmail.com>|
 |1|Brian <bdmorin@users.noreply.github.com>|
 |1|Burung Hantu <privacytoolsIO@users.noreply.github.com>|
+|1|Buster "Silver Eagle" Neece <loobalightdark@gmail.com>|
 |1|C.J. Jameson <cjcjameson@gmail.com>|
 |1|Caleb Xu <calebcenter@live.com>|
 |1|Calle Wolff <carl@wolff.se>|
@@ -285,7 +309,9 @@
 |1|Chanchal Kumar Ghosh <chanchal_ghosh1987@yahoo.co.in>|
 |1|Chandan Rai <dev.chandan.rai@gmail.com>|
 |1|Charles Barnes <cbarnes@bullhorn.com>|
+|1|Charles Barnes <charlesabarnesjr@gmail.com>|
 |1|Chema <neo22s@gmail.com>|
+|1|Chris Legault <chrislegault2011@gmail.com>|
 |1|Christoph (Sheogorath) Kern <sheogorath@shivering-isles.com>|
 |1|Christoph Kappestein <k42b3.x@gmail.com>|
 |1|Christoph Wiechert <wio@psitrax.de>|
@@ -301,6 +327,7 @@
 |1|Danny <dannyvankooten@gmail.com>|
 |1|David Baldwynn <whitef0x0@users.noreply.github.com>|
 |1|David Ng <david90@users.noreply.github.com>|
+|1|David Stephens <dave@force9.org>|
 |1|David Yu <david.yu.ftw@gmail.com>|
 |1|Denis <isdn@users.noreply.github.com>|
 |1|Denis <issden@gmail.com>|
@@ -319,6 +346,8 @@
 |1|Eran Chetz <eran.chetzroni@algolia.com>|
 |1|Eren Hatırnaz <erenhatirnaz@hotmail.com.tr>|
 |1|Eric Moon <eric@ericmoon.net>|
+|1|Eric Nemchik <eric@nemchik.com>|
+|1|Ethan Hampton <EMH333@users.noreply.github.com>|
 |1|Ethan Madden <crazeh.monkeh@gmail.com>|
 |1|Eugen <eugen@zeonfederated.com>|
 |1|Evelthon Prodromou <epro@prodromou.eu>|
@@ -327,15 +356,19 @@
 |1|Florian Kaiser <florian.kaiser@fnkr.net>|
 |1|Florian Wilhelm <f.wilhelm@tarent.de>|
 |1|FortressBuilder <FortressBuilder@users.noreply.github.com>|
+|1|François Jacquet <francoisjacquet@users.noreply.github.com>|
 |1|FreeScout <40499291+freescout-helpdesk@users.noreply.github.com>|
+|1|Galen Abell <galen@galenabell.com>|
 |1|Girish Ramakrishnan <mail@girish.in>|
 |1|Greg Chetcuti <greg@chetcuti.com>|
 |1|Guilherme Oenning <me@goenning.net>|
+|1|Henrique Holanda <contato@henriqueholanda.com.br>|
 |1|Herman Zvonimir Došilović <hermanz.dosilovic@gmail.com>|
 |1|IAlwaysBeCoding <erik.dominguez1003@gmail.com>|
 |1|Icantcodeatall <francois.lachese@me.com>|
 |1|Igor Antun <IgorAntun@users.noreply.github.com>|
 |1|Igor Petrov <garik.piton@gmail.com>|
+|1|Imron RA <42175898+imronra@users.noreply.github.com>|
 |1|Ivan Krutov <vania-pooh@vania-pooh.com>|
 |1|Izac Lorimer <izaclorimer@users.noreply.github.com>|
 |1|Jack <jackdev@mailbox.org>|
@@ -351,6 +384,8 @@
 |1|Jelmer Vernooij <jelmer@jelmer.uk>|
 |1|Jeremiah Marks <jeremiah@jlmarks.org>|
 |1|Joel Calado <joelcalado@gmail.com>|
+|1|Jon Schoning <jonschoning@gmail.com>|
+|1|Jordan <15741144+jrdnlc@users.noreply.github.com>|
 |1|Josh Harmon <me@joshharmon.me>|
 |1|Joshua Hamilton <joshua.hamilton@fabricut.com>|
 |1|José Castro <cogurov@gmail.com>|
@@ -359,8 +394,10 @@
 |1|Julien Reichardt <jul.reich43@opmbx.org>|
 |1|Justin Clift <justin@postgresql.org>|
 |1|Justin O'Reilly <justin@oreilly.me>|
+|1|Karl Gumerlock <karl@gumerlock.com>|
 |1|KarloLuiten <github@karloluiten.nl>|
 |1|Kaveet Laxmidas <kaveetlaxmidas@gmail.com>|
+|1|Kelvin <kelvinhammond@users.noreply.github.com>|
 |1|Ketrel <webmaster@krahs-emag.com>|
 |1|Kevin Lin <LINKIWI@users.noreply.github.com>|
 |1|Keyhaku <jones@bious.fr>|
@@ -375,6 +412,7 @@
 |1|Leonard Thomas Wall <github@tenchooo.me>|
 |1|Lescaudron Mathieu <mathieu@lescaudron.com>|
 |1|Liran Tal <liran.tal@gmail.com>|
+|1|Luuk Nieuwdorp <luuknieuwdorp@users.noreply.github.com>|
 |1|Marcin Karpezo <m.karpezo@nencki.gov.pl>|
 |1|Marco Dickert <dickert.marco@gmail.com>|
 |1|Marco Kamner <marco@it-kamner.de>|
@@ -385,11 +423,11 @@
 |1|Martin Malinda <malindacz@gmail.com>|
 |1|Marvin <Groruk@uberdoge.network>|
 |1|MatFluor <MatFluor@users.noreply.github.com>|
-|1|Mats Estensen <matsest@mxe.no>|
 |1|Matt Lee <mattl@users.noreply.github.com>|
 |1|Matteo Piccina <matteo@beiphone.it>|
 |1|Matthew Dews <matthew-dews@users.noreply.github.com>|
 |1|Matthew East <matthew@mattheweast.me>|
+|1|Max <2843450+b-m-f@users.noreply.github.com>|
 |1|Michael Barrow <michael@barrow.me>|
 |1|Michael Burns <michael@mirwin.net>|
 |1|Michael Malura <github@malura.me>|
@@ -410,17 +448,21 @@
 |1|Oleg Agafonov <oleg.agafonov@telestax.com>|
 |1|Oliver Kopp <kopp.dev@gmail.com>|
 |1|Opeyemi Obembe <fickledreams@yahoo.com>|
+|1|PMK <webmaster@pmklaassen.com>|
 |1|Paolo Pustorino <stickgrinder@gmail.com>|
 |1|Pau Kiat Wee <paukiatwee@gmail.com>|
 |1|Paul <paul@rosanbo.com>|
 |1|Paul Libbrecht <paul.libbrecht@dipf.de>|
 |1|Paul Libbrecht <paul@hoplahup.net>|
 |1|Pavlo Vodopyan <pavel.vodopyan@gmail.com>|
+|1|Paweł Jakimowski <pawel@jakimowski.info>|
 |1|Paweł Kapała <bylek77@gmail.com>|
 |1|Peter Brunner <pbrunner@gmail.com>|
 |1|Peter van den Hurk <runical1991@gmail.com>|
 |1|Phill <phill@formbet.co.uk>|
 |1|Phonic Mouse <phonicmouse@gmai.com>|
+|1|Pierre Dubouilh <pldubouilh@gmail.com>|
+|1|Pietro Pe46dro Marangon <pietro@marangon.me>|
 |1|Pouria Ezzati <ezzati.upt@gmail.com>|
 |1|Prahalad Belavadi <prahaladbelavadi@gmail.com>|
 |1|Rafael Milewski <Milewski@users.noreply.github.com>|
@@ -428,18 +470,22 @@
 |1|Remy Adriaanse <remy@adriaanse.it>|
 |1|Remy Honig <remyhonig@users.noreply.github.com>|
 |1|Riddler <Iamjithin@live.com>|
+|1|Robert Charusta <rchar@protonmail.com>|
 |1|Roberto Rosario <roberto.rosario.gonzalez@gmail.com>|
 |1|RussellAult <RussellAult@users.noreply.github.com>|
 |1|Ryan Halliday <ry167@ry167.com>|
 |1|Ryan Noelk <ryannoelk@gmail.com>|
+|1|Rzeszow <6783135+Rzeszow@users.noreply.github.com>|
 |1|Sahin Boydas <sahin@movielala.com>|
 |1|Salvatore Gentile <SalGnt@users.noreply.github.com>|
 |1|Sam Patterson <bitcoin@samuelrpatterson.com>|
 |1|Sam Wilson <sam@samwilson.id.au>|
 |1|Samuel Garneau <sam@garno.me>|
+|1|Sartaj <sartaj@atomicsquare.com>|
 |1|Scott Humphries <sscotth@users.noreply.github.com>|
 |1|Senan Kelly <senan.f.b.kelly+github@gmail.com>|
 |1|Sergey Bronnikov <sergeyb@bronevichok.ru>|
+|1|Sergey Ponomarev <me@sergey-ponomarev.ru>|
 |1|Sheldon Rupp <me@shel.io>|
 |1|Simon Hanna <simon.hanna@jesus.de>|
 |1|Spencer McIntyre <zeroSteiner@gmail.com>|
@@ -450,6 +496,8 @@
 |1|THS-on <THS-on@users.noreply.github.com>|
 |1|Tanner Collin <git@tannercollin.com>|
 |1|The Scorpion <tehscorpion@users.noreply.github.com>|
+|1|Thomas Ferney <antiseptikk@users.noreply.github.com>|
+|1|Thomas Hansen <th4019@gmail.com>|
 |1|Thomas Rohlik <rohlik@3server.cz>|
 |1|Thorsten Rinne <thorsten@phpmyfaq.de>|
 |1|Tim Allingham <tim@timallingham.net>|
@@ -462,21 +510,24 @@
 |1|Vadim Markovtsev <vadim@sourced.tech>|
 |1|Viktor Geringer <devfakeplus@googlemail.com>|
 |1|Vincent Dauce <eXorus@users.noreply.github.com>|
+|1|Webmasterish <webmasterish@gmail.com>|
 |1|William Gathoye <william@gathoye.be>|
 |1|Yurii Rashkovskii <yrashk@gmail.com>|
 |1|axeloz <axel@mabox.eu>|
 |1|benmaynard11 <allowin-217941-github@vhost244.maynardnetworks.com>|
+|1|bitcoinshirt <36959754+bitcoinshirt@users.noreply.github.com>|
 |1|bricej13 <bricej13@gmail.com>|
 |1|cbdev <cb@cbcdn.com>|
+|1|costpermille <costpermille@users.noreply.github.com>|
 |1|cpdev <cpdevelops@users.noreply.github.com>|
 |1|dimqua <dimqua@lavabit.com>|
 |1|disk0x <mdtha@tutanota.com>|
 |1|domainzero <domainzero@users.noreply.github.com>|
 |1|dsx <free.robots@gmail.com>|
 |1|ePirat <epirat07@gmail.com>|
-|1|emeric <itmfr@yahoo.fr>|
 |1|evitalis <evitalis@users.noreply.github.com>|
 |1|fghhfg <fghhfg@users.noreply.github.com>|
+|1|fi78 <31729946+fi78@users.noreply.github.com>|
 |1|florianl <florianl@users.noreply.github.com>|
 |1|foorb <foorb@users.noreply.github.com>|
 |1|ghaseminya <ghaseminya@gmail.com>|
@@ -485,6 +536,7 @@
 |1|ilsi <ilsi@users.noreply.github.com>|
 |1|itsnotv <itsnotv@users.noreply.github.com>|
 |1|jake <jake@diesel>|
+|1|jarek91 <jarek91@users.noreply.github.com>|
 |1|jgi <public-devgit-common@gissehel.org>|
 |1|josh <joshua.r.li.98@gmail.com>|
 |1|lachlan-00 <lachlan.00@gmail.com>|
diff --git a/README.md b/README.md
index 40a47d8a..ad7fef84 100644
--- a/README.md
+++ b/README.md
@@ -26,8 +26,7 @@ See [Contributing](.github/CONTRIBUTING.md).
       - [Mailing lists and newsletters](#mailing-lists-and-newsletters)
       - [Webmail clients](#webmail-clients)
     - [IRC](#irc)
-    - [SIP](#sip)
-    - [IPBX](#ipbx)
+    - [SIP/IPBX](#sip)
     - [Social Networks and Forums](#social-networks-and-forums)
     - [XMPP](#xmpp)
       - [XMPP Servers](#xmpp-servers)
@@ -272,6 +271,7 @@ _CalDAV or CardDAV clients._
 - [Freenet](https://freenetproject.org/index.html) - Anonymously share files, browse and publish "freesites" (web sites accessible only through Freenet) and chat on forums. ([Source Code](https://github.com/freenet/fred)) `GPL-2.0` `Java`
 - [Friends](http://moose-team.github.io/friends/) - P2P chat powered by the web. ([Source Code](https://github.com/moose-team/friends)) `MIT` `Nodejs`
 - [GNUnet](https://gnunet.org/) - Free software framework for decentralized, peer-to-peer networking. ([Source Code](https://gnunet.org/git/)) `GPL-3.0` `C`
+- [Gotify](https://gotify.net/) - Self-hosted notification server with Android and CLI clients, similar to PushBullet. ([Source Code](https://github.com/gotify/server), [Clients](https://github.com/gotify/android)) `MIT` `Go`
 - [Hawkpost](https://hawkpost.co) - HawkPost is a web app that lets you create unique links that you can share with a person that desires to send you important information but doesn't know how to encrypt it. The message is encrypted in their browser and sent to your email address. ([Source Code](https://github.com/whitesmith/hawkpost)) `MIT` `Python`
 - [Hubl.in](https://hubl.in/) - WebRTC powered video conference, chat and collaborative editor. ([Source Code](https://github.com/linagora/hublin)) `AGPL-3.0` `Nodejs`
 - [Jitsi Meet](https://jitsi.org/Projects/JitsiMeet) - Jitsi Meet is an OpenSource (MIT) WebRTC Javascript application that uses Jitsi Videobridge to provide high quality, scalable video conferences. ([Source Code](https://github.com/jitsi/jitsi-meet)) `MIT` `Javascript`
@@ -285,7 +285,6 @@ _CalDAV or CardDAV clients._
 - [Mibew](https://mibew.org) - Mibew Messenger is an open-source live support application written in PHP and MySQL. It enables one-on-one chat assistance in real-time directly from your website. ([Demo](https://mibew.org/demo2), [Source Code](https://github.com/Mibew/mibew)) `Apache-2.0` `PHP`
 - [Mumble](http://wiki.mumble.info/wiki/Main_Page) - Low-latency, high quality voice/text chat software. ([Source Code](https://github.com/mumble-voip/mumble), [Clients](https://wiki.mumble.info/wiki/3rd_Party_Applications)) `BSD-3-Clause` `C++`
 - [Node-Chat](https://github.com/IgorAntun/node-chat) - Not-so-basic open-source chat with admin features. `MIT` `Nodejs`
-- [Pushjet](https://pushjet.io/) - Self hosted push notification service built with a simple API making sending notifications easy. ([Source Code](https://github.com/Pushjet/Pushjet-Server-Api)) `BSD-2-Clause` `Python`
 - [Rallly](http://rallly.co) - Rallly is a free collaborative scheduling service. ([Source Code](https://github.com/lukevella/Rallly)) `CC-BY-SA-4.0` `Nodejs`
 - [RetroShare](http://retroshare.org) - Secured and decentralized communication system. Offers decentralized chat, forums, messaging, file transfer. ([Source Code](https://github.com/RetroShare/RetroShare)) `GPL-2.0` `С++`
 - [Jami](https://jami.net/) - Free and universal communication platform which preserves the user's privacy and freedoms (formerly GNU Ring). ([Source Code](https://git.ring.cx/savoirfairelinux/ring-project)) `GPL-3.0` `C++`
@@ -361,7 +360,7 @@ _Mailing lists servers and mass mailing software - one message to many recipient
 - [Sympa](https://www.sympa.org/) - Mailing list manager. `GPL-2.0` `Perl`
 
 #### Webmail clients
-
+- [AfterLogic](https://afterlogic.org/webmail-lite) - Fast and easy-to-use webmail front-end for your existing IMAP mail server, Plesk or cPanel. ([Demo](https://lite.afterlogic.com/), [Source Code](https://github.com/afterlogic/webmail-lite-8)) `AGPL-3.0` `PHP`
 - [Cypht](http://cypht.org/index.html) - Feed reader for your email accounts. ([Source Code](https://github.com/jasonmunro/hm3)) `GPL-2.0` `PHP`
 - [Disposable Mailbox](https://github.com/synox/disposable-mailbox) - Simple disposable mailbox web-app based on a catch-all IMAP mailbox. ([Demo](https://bhadoomail.com/)) `GPL-3.0` `PHP`
 - [IMP](https://www.horde.org/apps/imp/) - HORDE application that provides webmail access to IMAP and POP3 accounts. ([Demo](http://demo.horde.org/), [Source Code](https://www.horde.org/download/imp)) `GPL-2.0` `PHP`
@@ -392,24 +391,18 @@ _[IRC](https://en.wikipedia.org/wiki/Internet_Relay_Chat) communication software
 
 **[`^        back to top        ^`](#)**
 
-_[SIP](https://en.wikipedia.org/wiki/Session_Initiation_Protocol) telephony software_
+_[SIP](https://en.wikipedia.org/wiki/Session_Initiation_Protocol)/[IPBX](https://en.wikipedia.org/wiki/IP_PBX) telephony software_
 
 - [Asterisk](http://www.asterisk.org/) - Easy to use but advanced IP PBX system, VoIP gateway and conference server. `GPL-2.0` `C`
+- [ASTPP](https://www.astppbilling.org/) - is an Open Source VoIP Billing Solution for Freeswitch. It supports prepaid and postpaid billing with call rating and credit control. It also provides many other features. ([Source Code](https://github.com/iNextrix/ASTPP)) `AGPL-3.0` `PHP`
+- [Freepbx](http://www.freepbx.org) - Web-based open source GUI that controls and manages Asterisk. ([Source Code](http://git.freepbx.org/projects/FREEPBX)) `GPL-2.0` `PHP`
 - [FreeSWITCH](https://freeswitch.org/) - Scalable open source cross-platform telephony platform. ([Source Code](https://freeswitch.org/stash/projects/FS/repos/freeswitch/browse)) `MPL-2.0` `C`
+- [FusionPBX](https://www.fusionpbx.com/) - Open source project that provides a customizable and flexible web interface to the very powerful and highly scalable multi-platform voice switch called FreeSWITCH. ([Source Code](https://github.com/fusionpbx/fusionpbx)) `MPL-1.1` `PHP`
 - [Homer](https://www.sipcapture.org/) - Troubleshooting and monitoring VoIP calls. ([Source Code](https://github.com/sipcapture/homer)) `AGPL-3.0` `Angular/C`
 - [Kamailio](http://www.kamailio.org/w/) - Modular SIP server (registrar/proxy/router/etc). ([Source Code](https://github.com/kamailio/kamailio)) `GPL-2.0` `C`
+- [Kazoo](http://2600hz.org/) - KAZOO is an open-source, highly scalable software platform designed to provide carrier-grade VoIP switch functions and features. ([Source Code](https://github.com/2600hz/KAZOO)) `MPL-1.1` `Erlang`
 - [Ostel](https://dev.guardianproject.info/projects/ostel/wiki/Server_Documentation) - Secure SIP telephony setup with ZRTP encryption. `GPL-3.0` `Ruby`
 - [Tapir](http://www.sip3.io/) - Troubleshooting and real-time monitoring of VoIP-based systems. ([Source Code](https://github.com/sip3io/tapir)) `Apache-2.0` `Java/Kotlin`
-
-### IPBX
-
-**[`^        back to top        ^`](#)**
-
-_[IPBX](https://en.wikipedia.org/wiki/IP_PBX) telephony software_
-
-- [Freepbx](http://www.freepbx.org) - Web-based open source GUI that controls and manages Asterisk. ([Source Code](http://git.freepbx.org/projects/FREEPBX)) `GPL-2.0` `PHP`
-- [FusionPBX](https://www.fusionpbx.com/) - Open source project that provides a customizable and flexible web interface to the very powerful and highly scalable multi-platform voice switch called FreeSWITCH. ([Source Code](https://github.com/fusionpbx/fusionpbx)) `MPL-1.1` `PHP`
-- [Kazoo](http://2600hz.org/) - KAZOO is an open-source, highly scalable software platform designed to provide carrier-grade VoIP switch functions and features. ([Source Code](https://github.com/2600hz/KAZOO)) `MPL-1.1` `Erlang`
 - [Wazo](http://wazo.community/) - Full-featured IPBX solution built atop Asterisk with integrated Web administration interface and REST-ful API. ([Source Code](https://github.com/wazo-pbx)) `GPL-3.0` `Python/PHP`
 
 ### Social Networks and Forums
@@ -441,12 +434,14 @@ _[IPBX](https://en.wikipedia.org/wiki/IP_PBX) telephony software_
 - [Movim](https://movim.eu/) - Modern, federated social network based on XMPP, with a fully featured group-chat, subscriptions and microblogging. ([Source Code](https://github.com/movim/movim)) `AGPL-3.0` `PHP`
 - [MyBB](http://www.mybb.com/) - Free, extensible forum software package. ([Source Code](https://github.com/mybb/mybb)) `LGPL-3.0` `PHP`
 - [NodeBB](https://nodebb.org/) - Node.js based forum software built for the modern web. ([Source Code](https://github.com/NodeBB/NodeBB)) `GPL-3.0` `Nodejs`
-- [Pleroma](https://pleroma.social) - Federated microblogging server, Mastodon, GNU social, & ActivityPub compatible. ([Source Code](https://git.pleroma.social/pleroma/pleroma)) `AGPL-3.0` `Elixir`
 - [Orange Forum](http://www.goodoldweb.com/) - Orange Forum is an easy to deploy forum that has minimal dependencies and uses very little javascript. ([Demo](https://groups.goodoldweb.com/), [Source Code](https://github.com/s-gv/orangeforum)) `BSD-3-Clause` `Go`
 - [OSSN](https://www.opensource-socialnetwork.org/) - Open Source Social Network (OSSN) is a social networking software written in PHP. It allows you to make a social networking website and helps your members build social relationships, with people who share similar professional or personal interests. ([Source Code](https://github.com/opensource-socialnetwork/opensource-socialnetwork)) `GPL-2.0` `PHP`
 - [Oxwall](http://www.oxwall.org/) - Oxwall is used for a wide range of projects starting from family sites and custom social networks to collaboration tools and enterprise community solutions. ([Source Code](https://bitbucket.org/oxwall/public)) `CPAL-1.0` `PHP`
 - [Patchwork](https://github.com/ssbc/patchwork) - Decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB). `AGPL-3.0-only` `JavaScript`
 - [phpBB](https://www.phpbb.com/) - Flat-forum bulletin board software solution that can be used to stay in touch with a group of people or can power your entire website. ([Source Code](https://github.com/phpbb/phpbb)) `GPL-2.0` `PHP`
+- [PixelFed](https://pixelfed.social) - Pixelfed is an open-source, federated platform alternate to Instagram. ([Source Code](http://github.com/pixelfed/pixelfed)) `AGPL-3.0` `PHP\HTML\Vue`
+- [Pleroma](https://pleroma.social) - Federated microblogging server, Mastodon, GNU social, & ActivityPub compatible. ([Source Code](https://git.pleroma.social/pleroma/pleroma)) `AGPL-3.0` `Elixir`
+- [PPnet](https://github.com/pixelpark/ppnet) - Create and host your own social network. `MIT` `Javascript`
 - [Pump.io](http://pump.io/) - Stream server that does most of what people really want from a social network. ([Source Code](https://github.com/e14n/pump.io)) `Apache-2.0` `Nodejs`
 - [remark42](https://remark42.com/) - A lightweight and simple comment engine, which doesn't spy on users. It can be embedded into blogs, articles or any other place where readers add comments. ([Demo](https://remark42.com/demo/), [Source Code](https://github.com/umputun/remark)) `MIT` `Go`
 - [Scoold](https://scoold.com) - Stack Overflow in a JAR. An enterprise-ready Q&A platform with full-text search, SAML, LDAP integration and social login support. ([Demo](https://live.scoold.com), [Source Code](https://github.com/Erudika/scoold)) `Apache-2.0` `Java`
@@ -572,6 +567,7 @@ _Recipe management_
 - [Pretix](https://pretix.eu/) - Django based ticket sales platform for events. ([Source Code](https://github.com/pretix)) `Apache-2.0` `Python`
 - [Reaction Commerce](https://reactioncommerce.com/) - Customizable, real-time reactive, JavaScript commerce platform. ([Source Code](https://github.com/reactioncommerce/reaction)) `GPL-3.0` `Nodejs`
 - [Saleor](http://getsaleor.com/) - Django based open-sourced e-commerce storefront. ([Demo](https://demo.getsaleor.com/), [Source Code](https://github.com/mirumee/saleor)) `BSD-3-Clause` `Python`
+- [Sharetribe](https://www.sharetribe.com) - An open source platform to create your own peer-to-peer marketplace, also available with SaaS model. ([Source Code](https://github.com/sharetribe/sharetribe)) `MIT` `Ruby`
 - [Shuup](https://www.shuup.com/) - Django powered fully customizable open source e-commerce framework for small and large sites. ([Source Code](https://github.com/shuup/shuup)) `AGPL-3.0` `Python`
 - [Shopware Community Edition](https://shopware.com/community/) - PHP based ppen source e-commerce software made in Germany. ([Demo](https://www.shopwaredemo.de/), [Source Code](https://github.com/shopware/shopware)) `AGPL-3.0` `PHP`
 - [Sylius](http://sylius.org/) - Symfony2 powered open source full-stack platform for eCommerce. ([Demo](http://sylius.org/demo), [Source Code](https://github.com/Sylius/Sylius)) `MIT` `PHP`
@@ -771,6 +767,7 @@ _Command-line file upload_
 - [h5ai](https://larsjung.de/h5ai/) - Modern file indexer for HTTP web servers with focus on your files. Directories are displayed in a appealing way and browsing them is enhanced by different views, a breadcrumb and a tree overview. ([Demo](https://larsjung.de/h5ai/demo/), [Source Code](https://github.com/lrsjng/h5ai)) `MIT` `PHP`
 - [IFM](https://github.com/misterunknown/ifm/) - Single script file manager. `MIT` `PHP`
 - [ResourceSpace](https://www.resourcespace.com) - ResourceSpace open source digital asset management software is the simple, fast, and free way to organise your digital assets. ([Demo](https://www.resourcespace.com/trial), [Source Code](https://www.resourcespace.com/svn)) `Other` `PHP`
+- [s3server](https://github.com/jessfraz/s3server) - Simple HTTP interface to index and browse files in a public S3 or Google Cloud Storage bucket. ([Demo](https://gifs.jessfraz.com/)) `MIT` `Go`
 - [Sprut.io](https://sprut.io) - 2 panel file manager with drag and drop features, code editor, text search, hotkeys. ([Demo](https://demo.sprut.io:9443), [Source Code](https://github.com/LTD-Beget/sprutio)) `GPL-3.0` `Python`
 - [Surfer](https://github.com/nebulade/surfer) - Simple static file server with webui to manage files. `MIT` `Nodejs`
 - [TagSpaces](https://www.tagspaces.org/) - TagSpaces is an offline, cross-platform file manager and organiser that also can function as a note taking app. The WebDAV version of the application can be installed on top of a WebDAV servers such as Nextcloud or ownCloud. ([Demo](http://demo.tagspaces.org), [Source Code](https://github.com/tagspaces/tagspaces)) `AGPL-3.0` `Javascript`
@@ -850,7 +847,8 @@ _Command-line file upload_
 - [Moodle](https://moodle.org/) - Moodle is a learning and courses platform with one of the largest open source communities worldwide. ([Demo](https://moodle.org/demo/), [Source Code](https://git.moodle.org/gw)) `GPL-3.0` `PHP`
 - [Open eClass](http://www.openeclass.org/) - Open eClass is an advanced e-learning solution that can enhance the teaching and learning process. ([Demo](http://demo.openeclass.org/), [Source Code](https://github.com/gunet/openeclass)) `GPL-2.0` `PHP`
 - [RELATE](https://documen.tician.de/relate/) - RELATE is a web-based courseware package, includes features such as: flexible rules, statistics, multi-course support, class calendar. ([Source Code](https://github.com/inducer/relate/)) `MIT` `Python`
-- [Sakai](https://www.sakaiproject.org/) - Flexible and feature-rich environment for teaching, learning, research and other collaboration. ([Demo](https://www.sakaiproject.org/try-sakai), [Source Code](https://github.com/sakaiproject/sakai)) `ECL-2.0` `Java`
+- [RosarioSIS](https://www.rosariosis.org/) - RosarioSIS, free Student Information System for school management. ([Demo](https://www.rosariosis.org/demo/), [Source Code](https://gitlab.com/francoisjacquet/rosariosis/)) `GPL-2.0` `PHP`
+- [Sakai](https://www.sakaiproject.org/) - The Sakai project provides a flexible and feature-rich environment for teaching, learning, research and other collaboration. ([Demo](https://www.sakaiproject.org/try-sakai), [Source Code](https://github.com/sakaiproject/sakai)) `ECL-2.0` `Java`
 - [SchoolTool](http://schooltool.org/) - SchoolTool is free administrative software for schools. It includes demographics, gradebook, attendance, calendaring, reporting and more for primary and secondary schools. ([Source Code](http://bazaar.launchpad.net/~schooltool-owners/schooltool/2.8/files)) `GPL-2.0` `Python`
 
 ## Maps and Global Positioning System (GPS)
@@ -953,8 +951,8 @@ See also <https://en.wikipedia.org/wiki/List_of_streaming_media_systems>, <https
 - [Anchr](https://anchr.io) - Anchr is a toolbox for tiny tasks on the internet, including bookmark collections, URL shortening and (encrypted) image uploads. ([Source Code](https://github.com/n1try/anchr)) `GPL-3.0` `Nodejs`
 - [Anuko](https://www.anuko.com/time_tracker/index.htm) - Anuko provides simple time and project tracking on a selfhosted basis. ([Demo](https://timetracker.anuko.com/), [Source Code](https://github.com/anuko/timetracker)) `Other` `PHP`
 - [asciiflow](http://asciiflow.com/) - Flow Diagram Drawing Tool. ([Source Code](https://github.com/lewish/asciiflow2)) `GPL-3.0` `Java/JavaScript`
-- [blynk](http://www.blynk.cc/) - Platform with iOs and Android apps to control Arduino, ESP8266, Raspberry Pi and similar microcontroller boards over the Internet. ([Source Code](https://github.com/blynkkk/blynk-server)) `AGPL-3.0` `Java`
-- [CampaignChain](https://www.campaignchain.com/) - Dashboard to plan, execute, monitor and optimize marketing campaigns. ([Source Code](https://github.com/CampaignChain/campaignchain)) `Apache-2.0` `PHP`
+- [blynk](http://www.blynk.cc/) - Platform with iOS and Android apps to control Arduino, ESP8266, Raspberry Pi and similar microcontroller boards over the Internet. ([Source Code](https://github.com/blynkkk/blynk-server)) `AGPL-3.0` `Java`
+- [CUPS](https://www.cups.org/) - The Common Unix Print System uses Internet Printing Protocol (IPP) to support printing to local and network printers. ([Source Code](https://github.com/apple/cups)) `GPL-2.0` `C`
 - [DomainMOD](https://domainmod.org) - Application to manage your domains and other internet assets in a central location. DomainMOD includes a Data Warehouse framework that allows you to import your WHM/cPanel web server data so that you can view, export, and report on your data. ([Demo](https://demo.domainmod.org), [Source Code](https://github.com/domainmod/domainmod)) `GPL-3.0` `PHP`
 - [EasyBook Project](http://easybook-project.org/) - Book publishing as easy as it should be. ([Source Code](https://github.com/javiereguiluz/easybook)) `MIT` `PHP`
 - [Flox](https://github.com/devfake/flox) `⚠` - Self hosted movie, TV series and anime watch list with a 3-point rating system. Uses The Movie Database backend for information. ([Demo](http://80.240.132.120/flox-demo/public/)) `MIT` `PHP`
@@ -1042,6 +1040,7 @@ See https://github.com/n1trux/awesome-sysadmin#monitoring and https://github.com
 - [ShareLaTex](https://www.sharelatex.com/) - Web-based collaborative LaTeX editor. ([Source Code](https://github.com/sharelatex/sharelatex)) `AGPL-3.0` `Ruby`
 - [Standard Notes](https://standardnotes.org) - Simple and private notes app. Protect your privacy while getting more done. That's Standard Notes. ([Demo](https://app.standardnotes.org/), [Source Code](https://github.com/standardnotes)) `GPL-3.0` `Ruby`
 - [to-markdown](https://domchristie.github.io/to-markdown/) - HTML to Markdown converter written in JavaScript. ([Source Code](https://github.com/domchristie/to-markdown)) `MIT` `JavaScript`
+- [Trilium Notes](https://github.com/zadam/trilium) - Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases. `AGPL-3.0` `Nodejs`
 - [Turtl](https://turtl.it/) - Totally private personal database and note taking app. ([Source Code](https://github.com/turtl)) `GPL-3.0` `CommonLisp`
 
 ## Office Suites
@@ -1076,10 +1075,12 @@ See https://github.com/n1trux/awesome-sysadmin#monitoring and https://github.com
 
 - [0bin](https://github.com/sametmax/0bin) - Client side encrypted pastebin. `WTFPL` `Python`
 - [bepasty](https://bepasty-server.readthedocs.io/en/latest/) - A pastebin for all kinds of files. ([Source Code](https://github.com/bepasty/bepasty-server)) `BSD-2-Clause` `Python`
+- [bin](https://github.com/w4/bin) - a paste bin. ([Demo](https://bin.doyle.la)) `WTFPL/0BSD` `Rust`
 - [CoderVault](https://github.com/codervault) - Open source, self-hosted, snippet manager. ([Source Code](https://github.com/codervault/codervault)) `MIT` `Ruby`
 - [cryptonote](https://cryptonote.me/) - Simple open source web application that lets users encrypt and share messages that can only be read once. ([Source Code](https://github.com/alainmeier/cryptonote)) `MIT` `Ruby`
 - [EdPaste](https://github.com/Edraens/EdPaste) - Self-hosted pastebin written in Laravel (PHP Framework). ([Demo](https://paste.edra.ovh/)) `MIT` `PHP`
 - [fiche](https://github.com/solusipse/fiche) - Command line pastebin, all you need is netcat. ([Demo](http://termbin.com/)) `MIT` `C`
+- [Fugacious](https://fugacio.us) - Open source short-term secure messaging (OSSSM). ([Source Code](https://github.com/fugacious/fugacious))
 - [GIST](https://gitnet.fr/deblan/gist) - GIST is an open-source application to share code. ([Demo](https://gist.deblan.org/)) `GPL-3.0` `PHP`
 - [hastebin](http://hastebin.com/about.md) - Open source pastebin written in node.js. ([Demo](http://hastebin.com/), [Source Code](https://github.com/seejohnrun/haste-server)) `MIT` `Nodejs`
 - [Modern Paste](https://www.modernpaste.com) - Modern pastebin with a contemporary, minimalistic user interface backed by a robust feature set. ([Source Code](https://github.com/LINKIWI/modern-paste)) `MIT` `Python`
@@ -1103,7 +1104,7 @@ See https://github.com/n1trux/awesome-sysadmin#monitoring and https://github.com
 
 **[`^        back to top        ^`](#)**
 
-See https://github.com/n1trux/awesome-sysadmin#metric--metric-collection
+See also [awesome-sysadmin#metric--metric-collection](https://github.com/n1trux/awesome-sysadmin#metric--metric-collection), [awesome-sysadmin#status-pages](https://github.com/n1trux/awesome-sysadmin#status-pages)
 
 - [Baby Buddy](https://github.com/cdubz/babybuddy) - Helps caregivers track baby sleep, feedings, diaper changes, and tummy time. ([Demo](https://babybuddy.herokuapp.com/)) `BSD-2-Clause` `Python`
 - [Dj Diabetes](https://github.com/foxmask/dj-diabetes) - My Glucose Manager - follow your daily health. `BSD-3-Clause` `Python`
@@ -1220,7 +1221,7 @@ See https://github.com/n1trux/awesome-sysadmin#metric--metric-collection
 
 ### Project Management
 
-_See also [Ticketing](#ticketing), [Task management/To-do lists](#task-managementto-do-lists)_
+_See also [Ticketing](#ticketing), [Task management/To-do lists](#task-managementto-do-lists), [awesome-sysadmin/Code Review](https://github.com/n1trux/awesome-sysadmin#code-review)_
 
 - [Bonobo Git Server](https://bonobogitserver.com/) - Set up your own self hosted git server on IIS for Windows. Manage users and have full control over your repositories with a nice user friendly graphical interface. ([Source Code](https://github.com/jakubgarfield/Bonobo-Git-Server)) `MIT` `C#`
 - [Fossil](https://www.fossil-scm.org/index.html/doc/trunk/www/index.wiki) - Distributed version control system featuring wiki and bug tracker. `BSD-2-Clause-FreeBSD` `C`
@@ -1257,6 +1258,7 @@ See **[Ticketing](#ticketing)**
 ### IDE/Tools
 
 - [Babelfish](https://doc.bblf.sh) - Self-hosted server for source code parsing. It can parse any file, in any supported language, extract an Abstract Syntax Tree from it, and convert it to a Universal Abstract Syntax Tree which can enable further analysis and transformation. ([Source Code](https://github.com/bblfsh/)) `GPL-3.0` `Go`
+- [Code-Server](https://github.com/codercom/code-server) - Visual Studio Code in the browser, hosted on a remote server. `MIT` `Nodejs/Docker`
 - [Eclipse Che](http://www.eclipse.org/che/) - Open source workspace server and cloud IDE. ([Source Code](https://github.com/eclipse/che)) `EPL-1.0` `Docker/Java`
 - [ICEcoder](https://icecoder.net/) - ICEcoder is a web IDE / browser based code editor, which allows you to develop websites directly within the web browser. ([Demo](http://demo.icecoder.net/ICEcoder/), [Source Code](https://github.com/mattpass/ICEcoder)) `MIT` `PHP`
 - [JS Bin](http://jsbin.com/) - Open source collaborative web development debugging tool. ([Source Code](https://github.com/jsbin/jsbin)) `MIT` `Nodejs`
@@ -1273,21 +1275,13 @@ See **[Ticketing](#ticketing)**
 
 ### Continuous Integration
 
-- [Concourse](https://concourse.ci/) - Concourse is a CI tool that treats pipelines as first class objects and containerizes every step along the way. ([Demo](https://ci.concourse.ci/), [Source Code](https://github.com/concourse/concourse)) `Apache-2.0` `Go`
-- [drone](https://drone.io/) - Drone is a Continuous Delivery platform built on Docker, written in Go. ([Source Code](https://github.com/drone/drone)) `Apache-2.0` `Go`
-- [Factor](http://www.factor.io/) - It's like IFTTT (if-this-then-that) for Dev and DevOps. ([Source Code](https://github.com/factor-io/factor)) `MIT` `Ruby`
-- [GolangCI](https://golangci.com/) - Open Source automated code review service for Go integrated with GitHub pull requests. ([Source Code](https://github.com/golangci/golangci)) `AGPL-3.0` `Go`
-- [Jenkins](https://jenkins-ci.org/) - Continuous Integration Server. ([Source Code](https://github.com/jenkinsci/jenkins/)) `MIT` `Java`
-- [Laminar](http://laminar.ohwg.net) - Fast, lightweight, simple and flexible Continuous Integration. ([Source Code](https://github.com/ohwgiles/laminar)) `GPL-3.0` `C++`
-- [PHP Censor](https://github.com/php-censor/php-censor) - Open source self-hosted continuous integration server for PHP projects. `BSD-2-Clause` `PHP`
-- [PHPCI](https://www.phptesting.org/) - Free and open source continuous integration specifically designed for PHP. ([Source Code](https://github.com/block8/phpci)) `BSD-2-Clause` `PHP`
-- [Strider](http://strider-cd.github.io/) - Open Source Continuous Deployment / Continuous Integration platform. ([Source Code](https://github.com/Strider-CD/strider)) `MIT` `Nodejs`
+_See [awesome-sysadmin/Continuous Integration & Continuous Deployment](https://github.com/n1trux/awesome-sysadmin#continuous-integration--continuous-deployment)_
 
 ### FaaS/Serverless
 
 *[Serverless computing on Wikipedia](https://en.wikipedia.org/wiki/Serverless_computing)*
 
-- [FX](https://github.com/metrue/fx) - fx is a tool to help you do Function as a Service with painless on your own servers. `MIT` `Go`
+- [fx](https://github.com/metrue/fx) - fx is a tool to help you do Function as a Service with painless on your own servers. `MIT` `Go`
 - [IronFunctions](https://github.com/iron-io/functions) - The serverless microservices platform by [iron.io](https://www.iron.io/). `Apache-2.0` `Go`
 - [LocalStack](https://localstack.cloud/) - LocalStack is a fully functional local AWS cloud stack. This includes Lambda for serverless computation. ([Source Code](https://github.com/localstack/localstack)) `Apache-2.0` `Python/Other`
 - [OpenFaaS](https://www.openfaas.com/) - Serverless Functions Made Simple for Docker & Kubernetes. ([Source Code](https://github.com/openfaas/faas)) `MIT` `Go`
@@ -1299,6 +1293,7 @@ See **[Ticketing](#ticketing)**
 - [Fusio](http://www.fusio-project.org/) - Open-source API management platform which helps to build and manage REST APIs. ([Demo](http://fusio-project.org/demo), [Source Code](https://github.com/apioo/fusio)) `AGPL-3.0` `PHP`
 - [Hapttic](https://github.com/jsoendermann/hapttic) - Simple HTTP server that forwards all requests to a shell script to handle webhooks you receive. `Apache-2.0` `Go`
 - [Para](http://www.paraio.org) - Flexible and modular backend framework/server for object persistence, API development and authentication. ([Source Code](https://github.com/erudika/para)) `Apache-2.0` `Java`
+- [Tyk](https://tyk.io) - Fast and scalable open source API Gateway. Out of the box, Tyk offers an API Management Platform with an API Gateway, API Analytics, Developer Portal and API Management Dashboard. ([Source Code](https://github.com/TykTechnologies/tyk)) `MPL-2.0` `Go`
 
 ### Documentation Generators
 
@@ -1332,7 +1327,6 @@ See https://staticsitegenerators.net and https://www.staticgen.com
 - [Crepido](https://github.com/arshad/crepido) - Create (kanban) boards to track users and projects from flat markdown files. `MIT` `Nodejs`
 - [Kanboard](http://kanboard.net/) - Simple and open source visual task board. ([Source Code](https://github.com/kanboard/kanboard)) `MIT` `PHP`
 - [myTinyTodo](http://www.mytinytodo.net/) - Simple way to manage your todo list in AJAX style. Uses PHP, jQuery, SQLite/MySQL. GTD compliant. ([Demo](http://www.mytinytodo.net/demo/), [Source Code](https://bitbucket.org/maxpozdeev/mytinytodo)) `GPL-2.0` `PHP`
-- [omgnata](https://github.com/chr15m/omgnata) - Mobile friendly zero-feature TODO list web app. Unix philosophy. `GPL-3.0` `ClojureScript`
 - [PHP Task/Todo list](https://github.com/lgg/tasks.php) - Simple task/todo list that uses a JSON text file for the tasks. `MIT` `PHP`
 - [Restyaboard](http://restya.com/board/) - Open source Trello-like kanban board. ([Demo](http://restya.com/board/demo.html), [Source Code](https://github.com/RestyaPlatform/board)) `OSL-3.0` `PHP`
 - [scrumblr](http://scrumblr.ca/) - Collaborative Online Scrum Tool Using Websockets, Node.js, jQuery, and CSS3. ([Demo](http://scrumblr.ca/demo), [Source Code](https://github.com/ocdtrekkie/scrumblr/tree/sandstorm)) `GPL-3.0` `Nodejs`
@@ -1344,6 +1338,7 @@ See https://staticsitegenerators.net and https://www.staticgen.com
 - [Taskwarrior](https://taskwarrior.org/) - Taskwarrior is Free and Open Source Software that manages your TODO list from your command line. It is flexible, fast, efficient, and unobtrusive. It does its job then gets out of your way. ([Source Code](https://taskwarrior.org/download/#git)) `MIT` `C++`
 - [Tinyissue](https://github.com/satrun77/tinyissue) - Simple Issue Tracking for Teams. `MIT` `PHP`
 - [todo](https://github.com/prologic/todo) - Simple todo list manager. ([Demo](https://todo.mills.io)) `MIT` `Go`
+- [todoMini](https://www.todomini.app/) - Mobile friendly zero-feature TODO list web app. Unix philosophy. ([Demo](https://appmini.github.io/todoMini/?demo), [Source Code](https://github.com/appMini/todoMini)) `GPL-3.0` `PHP/Clojure`
 - [Tracks](http://www.getontracks.org/) - Web-based application to help you implement David Allen’s [Getting Things Done™](https://en.wikipedia.org/wiki/Getting_Things_Done) methodology. ([Source Code](https://github.com/TracksApp/tracks)) `GPL-2.0` `Ruby`
 - [Volition](https://www.usevolition.com) - Opinionated open-source task management. ([Demo](https://www.usevolition.com/today/new?guest=true), [Source Code](https://github.com/garrettqmartin8/volition)) `MIT` `Ruby`
 - [Wekan](https://wekan.github.io/) - Open-source Trello-like kanban. ([Demo](https://oasis.sandstorm.io/appdemo/m86q05rdvj14yvn78ghaxynqz7u2svw6rnttptxx49g1785cdv1h), [Source Code](https://github.com/wekan/wekan)) `MIT` `Nodejs`
@@ -1382,6 +1377,7 @@ See https://staticsitegenerators.net and https://www.staticgen.com
 - [Kutt](https://kutt.it) - Modern URL shortener with support for custom domains. ([Source Code](https://github.com/thedevs-network/kutt)) `MIT` `Nodejs`
 - [Link-shortener-bot](https://github.com/tommyku/link-shortener-front-end) `⚠` - URL shortener using a Telegram Bot. ([Demo](http://t.me/GiveMeShortLinkBot)) `MIT` `Ruby`
 - [Linkr](https://linkrapp.com) - Beautiful, fast URL shortening. ([Demo](https://demo.linkrapp.com), [Source Code](https://github.com/LINKIWI/linkr)) `MIT` `Python/Nodejs`
+- [liteshort](https://github.com/132ikl/liteshort) - User-friendly, actually ligthweight, and configurable URL shortener. ([Demo](https://ls.ikl.sh)) `MIT` `Python`
 - [Lstu](https://github.com/ldidry/lstu) - _Let's SHorten That Url_ - Lightweight URL shortener. `WTFPL` `Perl`
 - [Nimbus](https://github.com/ethanal/nimbus) - URL shortener and file sharer with a drag-and-drop OS X menu bar client and web interface. `MIT` `Python`
 - [Polr](https://project.polr.me/) - Modern, minimalist, modular, and lightweight URL shortener. ([Source Code](https://github.com/Cydrobolt/polr)) `GPL-2.0` `PHP`
@@ -1467,6 +1463,7 @@ See also [Documentation Generators](#documentation-generators), [Wikimatrix](htt
 **[`^        back to top        ^`](#)**
 
 - `⚠ ` - Depends on a third party network service
+- `0BSD` - [BSD Zero-Clause Licence](https://opensource.org/licenses/0BSD)
 - `AAL` - [Attribution Assurance License](https://opensource.org/licenses/AAL)
 - `AGPL-3.0` - [GNU Affero General Public License 3.0](https://www.gnu.org/licenses/agpl-3.0)
 - `AGPL-3.0-only` - [GNU Affero General Public License 3.0 only](https://spdx.org/licenses/AGPL-3.0-only.html)