Merge branch 'upstream-master'

2024-12-25 04:57:08 +00:00 · 2018-08-13 14:00:11 -04:00 · 2018-08-13 14:00:11 -04:00 · faeaaacceb
commit faeaaacceb
parent 9bad7cb2fe 97ab57618e
6 changed files with 627 additions and 604 deletions
--- a/.github/.mailmap
+++ b/.github/.mailmap
@ -1,8 +1,10 @@
 Kickball <ed.kickball@hotmail.com> <ed.kickball@hotmail.com>
-Andrew Rylatt <AndyR207@users.noreply.github.com> <AndyR207@users.noreply.github.com> <arylatt@users.noreply.github.com>
+Andrew Rylatt <arylatt@users.noreply.github.com> Andrew Rylatt
 Andrew Rylatt <arylatt@users.noreply.github.com> <AndyR207@users.noreply.github.com>
 Andrew Rylatt <arylatt@users.noreply.github.com> <andrew@rylatt.me>
 Andrew Rylatt <arylatt@users.noreply.github.com> <andrew.rylatt@citrix.com>
 n8225 <n8225@users.noreply.github.com> <nrew225@gmail.com>
 Thomas Dalichow <info@thomasdalichow.de> <2012-02-05.github.com@thomasdalichow.de>
 Andrew Rylatt <AndyR207@users.noreply.github.com> <andrew@rylatt.me>
 Keith Thibodeaux <kthibodeaux@peachtreebilling.com> Keith Thibodeaux <kthib89+github@gmail.com>
 Madhu GB <github@madhugb.com> Madhu GB <me@madhugb.com>
 Miguel Piedrafita <github@miguelpiedrafita.com> <git@miguelpiedrafita.com>
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -4,7 +4,7 @@ To ensure your PR is dealt with swiftly please check the following:
 - [ ] Your submissions are formatted according to the guidelines. 
-    ``- [Name](http://homepage/) - Short description, less than 250 characters. ([Demo](http://url.to/demo), [Source Code](http://url.of/source/code)) `License` `Language` ``
+    ``- [Name](http://homepage/) - Short description, less than 250 characters. ([Demo](http://url.to/demo), [Source Code](http://url.of/source/code), [Clients](https://url.to/list/of/related/clients-or-apps)) `License` `Language` ``
 - [ ] Your additions are ordered alphabetically.
 - [ ] Your additions are [Free software](https://en.wikipedia.org/wiki/Free_software), or if not they have been added to [non-free](non-free.md) and marked `⊘ Proprietary`.
@ -12,5 +12,6 @@ To ensure your PR is dealt with swiftly please check the following:
 - [ ] 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.
 - [ ] 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.
--- a/AUTHORS.md
+++ b/AUTHORS.md
@ -1,470 +1,482 @@
-Commits | Author 
+|Commits | Author |
-:---: | ---
+| :---: | --- |
-   649 | nodiscc <nodiscc@gmail.com>
+|686|nodiscc <nodiscc@gmail.com>|
-   293 | Kickball <ed.kickball@hotmail.com>
+|302|Kickball <ed.kickball@hotmail.com>|
-   164 | n8225 <n8225@users.noreply.github.com>
+|180|n8225 <n8225@users.noreply.github.com>|
-   114 | Andrew Rylatt <AndyR207@users.noreply.github.com>
+|122|Andrew Rylatt <arylatt@users.noreply.github.com>|
-    35 | Kovah <mail@kovah.de>
+|35|Kovah <mail@kovah.de>|
-    23 | cave beat <cave@cavebeat.org>
+|31|DJCrashdummy <DJCrashdummy@users.noreply.github.com>|
-    17 | Thomas Dalichow <info@thomasdalichow.de>
+|23|cave beat <cave@cavebeat.org>|
-    16 | Meitar M <meitarm@gmail.com>
+|17|Thomas Dalichow <info@thomasdalichow.de>|
-    14 | Miguel Piedrafita <github@miguelpiedrafita.com>
+|16|Meitar M <meitarm@gmail.com>|
-    13 | jungle-boogie <sean@jungleboogie.me>
+|14|Miguel Piedrafita <github@miguelpiedrafita.com>|
-    12 | Alex <alex@maximum.guru>
+|13|jungle-boogie <sean@jungleboogie.me>|
-    12 | Pe46dro <pietro@marangon.me>
+|12|Alex <alex@maximum.guru>|
-     9 | Andrew Peng <pengc99@gmail.com>
+|12|Pe46dro <pietro@marangon.me>|
-     9 | DJCrashdummy <DJCrashdummy@users.noreply.github.com>
+|9|Andrew Peng <pengc99@gmail.com>|
-     9 | Joubert RedRat <eu+github@redrat.com.br>
+|9|Joubert RedRat <eu+github@redrat.com.br>|
-     9 | Lance M <mightyfree@users.noreply.github.com>
+|9|Lance M <mightyfree@users.noreply.github.com>|
-     8 | CooperBarrett <anthony.lhuissier@openmailbox.org>
+|8|CooperBarrett <anthony.lhuissier@openmailbox.org>|
-     8 | Ferdinand Mütsch <mail@ferdinand-muetsch.de>
+|8|Ferdinand Mütsch <mail@ferdinand-muetsch.de>|
-     7 | Andrew Rylatt <arylatt@users.noreply.github.com>
+|7|Hammy Havoc <hammy@splitanatom.com>|
-     7 | Hammy Havoc <hammy@splitanatom.com>
+|7|Ilian <ugg.rock@gmail.com>|
-     7 | Ilian <ugg.rock@gmail.com>
+|7|Nick Busey <NickBusey@users.noreply.github.com>|
-     7 | n1trux <n1trux@users.noreply.github.com>
+|7|n1trux <n1trux@users.noreply.github.com>|
-     7 | phre4k <me@phre4k.at>
+|7|phre4k <me@phre4k.at>|
-     7 | édouard u. <mail@edouard.us>
+|7|édouard u. <mail@edouard.us>|
-     6 | Per Guth <mail@perguth.de>
+|6|Per Guth <mail@perguth.de>|
-     6 | Quinn Comendant <quinn@strangecode.com>
+|6|Quinn Comendant <quinn@strangecode.com>|
-     6 | Touhid Arastu <touhid.arastu@gmail.com>
+|6|Touhid Arastu <touhid.arastu@gmail.com>|
-     6 | cave <cavebeat@users.noreply.github.com>
+|6|cave <cavebeat@users.noreply.github.com>|
-     5 | James Cole <JC5@users.noreply.github.com>
+|5|James Cole <JC5@users.noreply.github.com>|
-     5 | Jean Champémont <jchampemont@users.noreply.github.com>
+|5|Jean Champémont <jchampemont@users.noreply.github.com>|
-     5 | Karl Coelho <karl.coelho1@gmail.com>
+|5|Karl Coelho <karl.coelho1@gmail.com>|
-     5 | Kevin Lin <developer@kevinlin.info>
+|5|Kevin Lin <developer@kevinlin.info>|
-     5 | Max Maischein <github@corion.net>
+|5|Max Maischein <github@corion.net>|
-     5 | Mohammad Faisal <faisalhmohd@live.com>
+|5|Mohammad Faisal <faisalhmohd@live.com>|
-     5 | Moti Korets <moti.kor@gmail.com>
+|5|Moti Korets <moti.kor@gmail.com>|
-     5 | Philip Kirkbride <kirkins@gmail.com>
+|5|Philip Kirkbride <kirkins@gmail.com>|
-     5 | mestaritonttu <mestaritonttu@mail.com>
+|5|Surgie Finesse <finesserus@gmail.com>|
-     4 | /c² <cagataycali@icloud.com>
+|5|mestaritonttu <mestaritonttu@mail.com>|
-     4 | AlessioCasco <cascoalessio@gmail.com>
+|4|/c² <cagataycali@icloud.com>|
-     4 | Alexandr Emelin <frvzmb@gmail.com>
+|4|AlessioCasco <cascoalessio@gmail.com>|
-     4 | AndrewCz <smacz42@users.noreply.github.com>
+|4|Alexandr Emelin <frvzmb@gmail.com>|
-     4 | Chris McCormick <chris@mccormick.cx>
+|4|AndrewCz <smacz42@users.noreply.github.com>|
-     4 | Cody Heimberger <cody.heimberger@printerlogic.com>
+|4|Chris McCormick <chris@mccormick.cx>|
-     4 | Colin Pokowitz <colin@cpdev.me>
+|4|Cody Heimberger <cody.heimberger@printerlogic.com>|
-     4 | Colin Pokowitz <colinpokowitz03@gmail.com>
+|4|Colin Pokowitz <colin@cpdev.me>|
-     4 | Cory Gibbons <hello@corygibbons.com>
+|4|Colin Pokowitz <colinpokowitz03@gmail.com>|
-     4 | D <DL88250@gmail.com>
+|4|Cory Gibbons <hello@corygibbons.com>|
-     4 | Dominik Pfaffenbauer <dominik@lineofcode.at>
+|4|D <DL88250@gmail.com>|
-     4 | Dr. Azrael Tod <github.com@g33ky.de>
+|4|Dominik Pfaffenbauer <dominik@lineofcode.at>|
-     4 | Eliot Whalan <ewhal@pantsu.cat>
+|4|Dr. Azrael Tod <github.com@g33ky.de>|
-     4 | Ilya Sevostyanov <d3th@zeen.ru>
+|4|Eliot Whalan <ewhal@pantsu.cat>|
-     4 | Jan Vlnas <jnv@users.noreply.github.com>
+|4|Ilya Sevostyanov <d3th@zeen.ru>|
-     4 | Jason Robinson <mail@jasonrobinson.me>
+|4|Jan Vlnas <jnv@users.noreply.github.com>|
-     4 | Jean Elchinger <jinformatique@riseup.net>
+|4|Jason Robinson <mail@jasonrobinson.me>|
-     4 | Joery Zegers <accounts@jzegers.nl>
+|4|Jean Elchinger <jinformatique@riseup.net>|
-     4 | Johannes Zellner <johannes@nebulon.de>
+|4|Joery Zegers <accounts@jzegers.nl>|
-     4 | Joshua Westerheide <dev@jdoubleu.de>
+|4|Johannes Zellner <johannes@nebulon.de>|
-     4 | MK <kohenkatz@gmail.com>
+|4|Joshua Westerheide <dev@jdoubleu.de>|
-     4 | Marius Voila <marius.voila@gmail.com>
+|4|MK <kohenkatz@gmail.com>|
-     4 | Rodolfo Berrios <inbox@rodolfoberrios.com>
+|4|Marius Voila <marius.voila@gmail.com>|
-     4 | Surgie Finesse <finesserus@gmail.com>
+|4|Rodolfo Berrios <inbox@rodolfoberrios.com>|
-     4 | Valmik <mail@valmik.in>
+|4|Valmik <mail@valmik.in>|
-     4 | bysslord <wxwlegend@gmail.com>
+|4|bysslord <wxwlegend@gmail.com>|
-     4 | dattaz <taz@dattaz.fr>
+|4|dattaz <taz@dattaz.fr>|
-     4 | dpfaffenbauer <dominik@lineofcode.at>
+|4|dpfaffenbauer <dominik@lineofcode.at>|
-     4 | dyu <david.yu.ftw@gmail.com>
+|4|dyu <david.yu.ftw@gmail.com>|
-     4 | paddo <mail@patrickrichter.net>
+|4|paddo <mail@patrickrichter.net>|
-     3 | Aguay <baraise.valentin@gmail.com>
+|3|Aguay <baraise.valentin@gmail.com>|
-     3 | Akhyar Amarullah <akhyrul@gmail.com>
+|3|Akhyar Amarullah <akhyrul@gmail.com>|
-     3 | BernsteinA <4685390+BernsteinA@users.noreply.github.com>
+|3|Alexey Velikiy <gmpota@gmail.com>|
-     3 | Burak Emre Kabakcı <emrekabakci@gmail.com>
+|3|BernsteinA <4685390+BernsteinA@users.noreply.github.com>|
-     3 | Conor O'Callaghan <brioscaibriste@users.noreply.github.com>
+|3|Burak Emre Kabakcı <emrekabakci@gmail.com>|
-     3 | Cédric Krier <cedk@users.noreply.github.com>
+|3|Conor O'Callaghan <brioscaibriste@users.noreply.github.com>|
-     3 | Danja Vasiliev <danja@k0a1a.net>
+|3|Cédric Krier <cedk@users.noreply.github.com>|
-     3 | Ethan Lowman <ethanal@users.noreply.github.com>
+|3|Danja Vasiliev <danja@k0a1a.net>|
-     3 | FoxMaSk <foxmask@users.noreply.github.com>
+|3|Ethan Lowman <ethanal@users.noreply.github.com>|
-     3 | Gabin <hello@gabinaureche.com>
+|3|FoxMaSk <foxmask@users.noreply.github.com>|
-     3 | Garrett Martin <me@garrettqmartin.com>
+|3|Gabin <hello@gabinaureche.com>|
-     3 | George C. Privon <privong@users.noreply.github.com>
+|3|Garrett Martin <me@garrettqmartin.com>|
-     3 | Görkem Çetin <gc@count.ly>
+|3|George C. Privon <privong@users.noreply.github.com>|
-     3 | Harvey Kandola <harvey@documize.com>
+|3|Görkem Çetin <gc@count.ly>|
-     3 | Ilya Pirozhenko <ilya.pir@gmail.com>
+|3|Harvey Kandola <harvey@documize.com>|
-     3 | IrosTheBeggar <paul.sori@gmail.com>
+|3|Ilya Pirozhenko <ilya.pir@gmail.com>|
-     3 | Jiří Komárek <xkomczax@centrum.cz>
+|3|IrosTheBeggar <paul.sori@gmail.com>|
-     3 | Kevin Hinterlong <kevinhinterlong@users.noreply.github.com>
+|3|Jan-Lukas Else <jlelse@users.noreply.github.com>|
-     3 | Lee Watson <rev@revthefox.co.uk>
+|3|Jiří Komárek <xkomczax@centrum.cz>|
-     3 | Leo Gaggl <leo@brightcookie.com.au>
+|3|Kevin Hinterlong <kevinhinterlong@users.noreply.github.com>|
-     3 | Marc Picaud <picaud.marc@gmail.com>
+|3|Lee Watson <rev@revthefox.co.uk>|
-     3 | Mariusz Kozakowski <11mariom+wordpress@gmail.com>
+|3|Leo Gaggl <leo@brightcookie.com.au>|
-     3 | Martin Gontovnikas <martin@gon.to>
+|3|Marc Picaud <picaud.marc@gmail.com>|
-     3 | Mathieu Leplatre <mathieu@leplat.re>
+|3|Mariusz Kozakowski <11mariom+wordpress@gmail.com>|
-     3 | Matt Baer <matt@baer.works>
+|3|Martin Gontovnikas <martin@gon.to>|
-     3 | Mitchell Urgero <info@urgero.org>
+|3|Mathieu Leplatre <mathieu@leplat.re>|
-     3 | Morris Jobke <hey@morrisjobke.de>
+|3|Matt Baer <matt@baer.works>|
-     3 | Ovidiu Dan <zmarty@users.noreply.github.com>
+|3|Mitchell Urgero <info@urgero.org>|
-     3 | Pavan Yara <yarapavan@gmail.com>
+|3|Morris Jobke <hey@morrisjobke.de>|
-     3 | Peter Thaleikis <spekulatius@users.noreply.github.com>
+|3|Ovidiu Dan <zmarty@users.noreply.github.com>|
-     3 | Pierre Blanes <inattendu@users.noreply.github.com>
+|3|Pavan Yara <yarapavan@gmail.com>|
-     3 | Pierre Tinard <Edraens@users.noreply.github.com>
+|3|Peter Thaleikis <spekulatius@users.noreply.github.com>|
-     3 | Pietro Marangon <pietro.marangon@gmail.com>
+|3|Pierre Blanes <inattendu@users.noreply.github.com>|
-     3 | Tobi Schäfer <interface@p3k.org>
+|3|Pierre Tinard <Edraens@users.noreply.github.com>|
-     3 | Yann Forget <forget.yann31@gmail.com>
+|3|Pietro Marangon <pietro.marangon@gmail.com>|
-     3 | Ye Lin Aung <me@yelinaung.com>
+|3|Tobi Schäfer <interface@p3k.org>|
-     3 | hebbet <pascal.herbert@gmail.com>
+|3|Yann Forget <forget.yann31@gmail.com>|
-     3 | jungle-boogie <sean@rastasean.net>
+|3|Ye Lin Aung <me@yelinaung.com>|
-     3 | moba <moba@users.noreply.github.com>
+|3|hebbet <pascal.herbert@gmail.com>|
-     3 | oknozor <paul.delafosse@protonmail.com>
+|3|jungle-boogie <sean@rastasean.net>|
-     3 | pszlazak <pszlazak@users.noreply.github.com>
+|3|moba <moba@users.noreply.github.com>|
-     3 | rett gerst <rettgerst@users.noreply.github.com>
+|3|oknozor <paul.delafosse@protonmail.com>|
-     3 | xBytez <git@xbytez.io>
+|3|pszlazak <pszlazak@users.noreply.github.com>|
-     2 | A. Cynic <chris@mretc.net>
+|3|rett gerst <rettgerst@users.noreply.github.com>|
-     2 | Adminrezo (Nico Dewaele) <nico@adminrezo.fr>
+|3|xBytez <git@xbytez.io>|
-     2 | Albert Cervera i Areny <albert@nan-tic.com>
+|2|A. Cynic <chris@mretc.net>|
-     2 | Alexander Ryzhov <gtihub@ryzhov-al.ru>
+|2|Adminrezo (Nico Dewaele) <nico@adminrezo.fr>|
-     2 | Alexis Metaireau <alexis@notmyidea.org>
+|2|Albert Cervera i Areny <albert@nan-tic.com>|
-     2 | Andrei Poenaru <andrei.poenaru@gmail.com>
+|2|Alexander Ryzhov <gtihub@ryzhov-al.ru>|
-     2 | Andrew Hayworth <hayworth@meraki.net>
+|2|Alexis Metaireau <alexis@notmyidea.org>|
-     2 | Arik Fraimovich <arik@arikfr.com>
+|2|Andrei Poenaru <andrei.poenaru@gmail.com>|
-     2 | Bartłomiej Kurzeja <B3QL@users.noreply.github.com>
+|2|Andrew Hayworth <hayworth@meraki.net>|
-     2 | Ben Yanke <ben@benyanke.com>
+|2|Arik Fraimovich <arik@arikfr.com>|
-     2 | Brendan Abolivier <contact@brendanabolivier.com>
+|2|Bartłomiej Kurzeja <B3QL@users.noreply.github.com>|
-     2 | Brian Morin <bdmorin@gmail.com>
+|2|Ben Yanke <ben@benyanke.com>|
-     2 | Carlo F. Quaglia <cfq20@users.noreply.github.com>
+|2|Benjamin Gamard <benjamin.gam@gmail.com>|
-     2 | Charles Farence III <charles@charlessite90.com>
+|2|Brendan Abolivier <contact@brendanabolivier.com>|
-     2 | Chris Missal <chris.missal@gmail.com>
+|2|Brian Morin <bdmorin@gmail.com>|
-     2 | Christopher Charbonneau Wells <cdubz@users.noreply.github.com>
+|2|Carlo F. Quaglia <cfq20@users.noreply.github.com>|
-     2 | Costin Moise <necenzurat@gmail.com>
+|2|Charles Farence III <charles@charlessite90.com>|
-     2 | Daniel Heath <daniel@heath.cc>
+|2|Chris Missal <chris.missal@gmail.com>|
-     2 | Daniel Ramirez Grave de Peralta <dxas90@gmail.com>
+|2|Christopher Charbonneau Wells <cdubz@users.noreply.github.com>|
-     2 | David Leonard <david@appliedtrust.com>
+|2|Costin Moise <necenzurat@gmail.com>|
-     2 | David Wayne Baxter <dbxt@users.noreply.github.com>
+|2|Daniel Heath <daniel@heath.cc>|
-     2 | Derek Viera <ma.dmviera01@gmail.com>
+|2|Daniel Ramirez Grave de Peralta <dxas90@gmail.com>|
-     2 | Deryck <dhenson02@users.noreply.github.com>
+|2|David Leonard <david@appliedtrust.com>|
-     2 | Dillon Stadther <dlstadther@gmail.com>
+|2|David Wayne Baxter <dbxt@users.noreply.github.com>|
-     2 | Dominic Pratt <github@dominicpratt.de>
+|2|Derek Viera <ma.dmviera01@gmail.com>|
-     2 | Eliot Berriot <contact@eliotberriot.com>
+|2|Deryck <dhenson02@users.noreply.github.com>|
-     2 | Feleg <fegul@users.noreply.github.com>
+|2|Dillon Stadther <dlstadther@gmail.com>|
-     2 | Felix Bartels <felix@host-consultants.de>
+|2|Dominic Pratt <github@dominicpratt.de>|
-     2 | Gabin Aureche <gabin.aureche@live.fr>
+|2|Eliot Berriot <contact@eliotberriot.com>|
-     2 | Gabriel Cossette <gabriel.cossette@gmail.com>
+|2|Feleg <fegul@users.noreply.github.com>|
-     2 | Gonçalo Valério <dethos@users.noreply.github.com>
+|2|Felix Bartels <felix@host-consultants.de>|
-     2 | Greg Slepak <contact@taoeffect.com>
+|2|Gabin Aureche <gabin.aureche@live.fr>|
-     2 | Greg V <greg@unrelenting.technology>
+|2|Gabriel Cossette <gabriel.cossette@gmail.com>|
-     2 | Henry Ruhs <info@redaxmedia.com>
+|2|Gonçalo Valério <dethos@users.noreply.github.com>|
-     2 | Jake Breindel <j.breindel2@outlook.com>
+|2|Greg Slepak <contact@taoeffect.com>|
-     2 | Jan Soendermann <jan.soendermann+git@gmail.com>
+|2|Greg V <greg@unrelenting.technology>|
-     2 | Jorge E. Gomez <jorge@jorgee.net>
+|2|Henry Ruhs <info@redaxmedia.com>|
-     2 | Joseph Dykstra <josephdykstra@gmail.com>
+|2|Jake Breindel <j.breindel2@outlook.com>|
-     2 | Julien Bisconti <veggiemonk@users.noreply.github.com>
+|2|Jan Soendermann <jan.soendermann+git@gmail.com>|
-     2 | Jérémie Astori <jeremie@astori.fr>
+|2|Jorge E. Gomez <jorge@jorgee.net>|
-     2 | Keith Thibodeaux <kthibodeaux@peachtreebilling.com>
+|2|Joseph Dykstra <josephdykstra@gmail.com>|
-     2 | Kevin Vandenborne <kevin.vandenborne@gmail.com>
+|2|Julien Bisconti <veggiemonk@users.noreply.github.com>|
-     2 | Klaus-Uwe Mitterer <info@klaus-uwe.me>
+|2|Jérémie Astori <jeremie@astori.fr>|
-     2 | Madhu GB <github@madhugb.com>
+|2|Keith Thibodeaux <kthibodeaux@peachtreebilling.com>|
-     2 | Malte Kiefer <malte.kiefer@mailgermania.de>
+|2|Kevin Vandenborne <kevin.vandenborne@gmail.com>|
-     2 | Marc Laporte <marc@laporte.name>
+|2|Klaus-Uwe Mitterer <info@klaus-uwe.me>|
-     2 | Marien Fressinaud <dev@marienfressinaud.fr>
+|2|Madhu GB <github@madhugb.com>|
-     2 | Markus M. Deuerlein <mdeuerlein@users.noreply.github.com>
+|2|Malte Kiefer <malte.kiefer@mailgermania.de>|
-     2 | MarkusMcNugen <marknewton5@gmail.com>
+|2|Marc Laporte <marc@laporte.name>|
-     2 | Martijn <mrtijn@riseup.net>
+|2|Marien Fressinaud <dev@marienfressinaud.fr>|
-     2 | Massimo Santini <massimo.santini@gmail.com>
+|2|Markus M. Deuerlein <mdeuerlein@users.noreply.github.com>|
-     2 | Matt Hazinski <matt@matthazinski.com>
+|2|MarkusMcNugen <marknewton5@gmail.com>|
-     2 | Matthieu Aubry <matt@piwik.org>
+|2|Martijn <mrtijn@riseup.net>|
-     2 | Michael Tunnell <MichaelTunnell@users.noreply.github.com>
+|2|Massimo Santini <massimo.santini@gmail.com>|
-     2 | Mikael Peigney <Mika56@users.noreply.github.com>
+|2|Matt Hazinski <matt@matthazinski.com>|
-     2 | Murali Govardhana <murali.govardhana@gmail.com>
+|2|Matthieu Aubry <matt@piwik.org>|
-     2 | Nick Busey <NickBusey@users.noreply.github.com>
+|2|Michael Tunnell <MichaelTunnell@users.noreply.github.com>|
-     2 | Nicolas Carlier <n.carlier@nunux.org>
+|2|Mikael Peigney <Mika56@users.noreply.github.com>|
-     2 | Oliver Giles <ohw.giles@gmail.com>
+|2|Murali Govardhana <murali.govardhana@gmail.com>|
-     2 | Patrik Ragnarsson <patrik@starkast.net>
+|2|Nicolas Carlier <n.carlier@nunux.org>|
-     2 | Pavel Lobashov <ShockwaveNN@gmail.com>
+|2|Oliver Giles <ohw.giles@gmail.com>|
-     2 | Peter Demin <poslano@gmail.com>
+|2|Patrik Ragnarsson <patrik@starkast.net>|
-     2 | Peter Ivanov <peter@microweber.com>
+|2|Pavel Lobashov <ShockwaveNN@gmail.com>|
-     2 | Phonic Mouse <phonicmouse@users.noreply.github.com>
+|2|Peter Demin <poslano@gmail.com>|
-     2 | Pierre Ozoux <pierre@ozoux.net>
+|2|Peter Ivanov <peter@microweber.com>|
-     2 | Poorchop <Poorchop@users.noreply.github.com>
+|2|Phonic Mouse <phonicmouse@users.noreply.github.com>|
-     2 | Raymond Berger <RayBB@users.noreply.github.com>
+|2|Pierre Ozoux <pierre@ozoux.net>|
-     2 | ReadmeCritic <frankensteinbot@gmail.com>
+|2|Poorchop <Poorchop@users.noreply.github.com>|
-     2 | Ricardo Torres <ricardo@rictorres.com.br>
+|2|Raymond Berger <RayBB@users.noreply.github.com>|
-     2 | Rid <shakeel.ridhwaan@gmail.com>
+|2|ReadmeCritic <frankensteinbot@gmail.com>|
-     2 | Rodolfo Berrios <rodolfo.berrios@gmail.com>
+|2|Ricardo Torres <ricardo@rictorres.com.br>|
-     2 | Roland Geider <roland@geider.net>
+|2|Rid <shakeel.ridhwaan@gmail.com>|
-     2 | Ryan DeShone <rfdeshon@gmail.com>
+|2|Rodolfo Berrios <rodolfo.berrios@gmail.com>|
-     2 | Ryan Mulligan <ryan@ryantm.com>
+|2|Roland Geider <roland@geider.net>|
-     2 | Sam Tuke <mail@samtuke.com>
+|2|Ryan DeShone <rfdeshon@gmail.com>|
-     2 | Sameer Al-Sakran <salsakran@users.noreply.github.com>
+|2|Ryan Mulligan <ryan@ryantm.com>|
-     2 | Shane Cooke <shanecooke@mac.com>
+|2|Sam Tuke <mail@samtuke.com>|
-     2 | Simon Vieille <simon@deblan.fr>
+|2|Sameer Al-Sakran <salsakran@users.noreply.github.com>|
-     2 | Simone Grignola <sito@grignola.ch>
+|2|Shane Cooke <shanecooke@mac.com>|
-     2 | Stefan Bohacek <stefan.bohacek@gmail.com>
+|2|Simon Vieille <simon@deblan.fr>|
-     2 | Stefane Fermigier <sf@fermigier.com>
+|2|Simone Grignola <sito@grignola.ch>|
-     2 | Stefano <sabas88@gmail.com>
+|2|Stefan Bohacek <stefan.bohacek@gmail.com>|
-     2 | Suraj Patil <thewhitetulip@users.noreply.github.com>
+|2|Stefane Fermigier <sf@fermigier.com>|
-     2 | Think <iwhiz@users.noreply.github.com>
+|2|Stefano <sabas88@gmail.com>|
-     2 | Thomas Citharel <tcit@tcit.fr>
+|2|Suraj Patil <thewhitetulip@users.noreply.github.com>|
-     2 | Tomer <tomer@campuscruizer.com>
+|2|Think <iwhiz@users.noreply.github.com>|
-     2 | Vadim Rutkovsky <vrutkovs@redhat.com>
+|2|Thomas Citharel <tcit@tcit.fr>|
-     2 | Van-Duyet Le <lvduit08@gmail.com>
+|2|Tomer <tomer@campuscruizer.com>|
-     2 | Will Bennett <william.11bennett@gmail.com>
+|2|Vadim Rutkovsky <vrutkovs@redhat.com>|
-     2 | Yann <forget.yann31@gmail.com>
+|2|Van-Duyet Le <lvduit08@gmail.com>|
-     2 | Zeniic <Zeniic@users.noreply.github.com>
+|2|Will Bennett <william.11bennett@gmail.com>|
-     2 | cornerot <cornerot@gmail.com>
+|2|Yann <forget.yann31@gmail.com>|
-     2 | cron410 <cron410@gmail.com>
+|2|Zeniic <Zeniic@users.noreply.github.com>|
-     2 | digiou <digitalbckp@gmail.com>
+|2|cornerot <cornerot@gmail.com>|
-     2 | erdihu <erdihu@users.noreply.github.com>
+|2|cron410 <cron410@gmail.com>|
-     2 | fengshaun <amoradi@fedoraproject.org>
+|2|digiou <digitalbckp@gmail.com>|
-     2 | fuerbringer <severin@protonmail.ch>
+|2|erdihu <erdihu@users.noreply.github.com>|
-     2 | gseva <gavrilovseva@gmail.com>
+|2|fengshaun <amoradi@fedoraproject.org>|
-     2 | icterine <account@caravat.e4ward.com>
+|2|fuerbringer <severin@protonmail.ch>|
-     2 | jimykk <JimyKK@users.noreply.github.com>
+|2|gseva <gavrilovseva@gmail.com>|
-     2 | markkrj <markkrj@users.noreply.github.com>
+|2|icterine <account@caravat.e4ward.com>|
-     2 | rafael-santiago <voidbrainvoid@gmail.com>
+|2|jimykk <JimyKK@users.noreply.github.com>|
-     2 | thomasfrivold <thomas.frivold@gmail.com>
+|2|markkrj <markkrj@users.noreply.github.com>|
-     2 | tillarnold <throwable42@gmail.com>
+|2|rafael-santiago <voidbrainvoid@gmail.com>|
-     2 | tomc3 <wordoftheday003@gmail.com>
+|2|thomasfrivold <thomas.frivold@gmail.com>|
-     2 | xy2z <xy2z@users.noreply.github.com>
+|2|tillarnold <throwable42@gmail.com>|
-     2 | yuche <i@yuche.me>
+|2|tomc3 <wordoftheday003@gmail.com>|
-     2 | ziλa sarikaya <sarikayaziya@gmail.com>
+|2|xy2z <xy2z@users.noreply.github.com>|
-     2 | znegva <znegva@users.noreply.github.com>
+|2|yuche <i@yuche.me>|
-     2 | 王可森 <wangkesen@users.noreply.github.com>
+|2|ziλa sarikaya <sarikayaziya@gmail.com>|
-     1 | Adam Johnson <me@adamj.eu>
+|2|znegva <znegva@users.noreply.github.com>|
-     1 | Alashov Berkeli <yunus.alashow@gmail.com>
+|2|王可森 <wangkesen@users.noreply.github.com>|
-     1 | Alejandro Rodríguez <arcxyz@users.noreply.github.com>
+|1|Adam C <39806482+adam-redcort@users.noreply.github.com>|
-     1 | Alex Bogdanovski <alex@erudika.com>
+|1|Adam Johnson <me@adamj.eu>|
-     1 | Alex Fornuto <alex@fornuto.com>
+|1|Akos Veres <veres@akos.me>|
-     1 | Alex Yumashev <33555768+alex-jitbit@users.noreply.github.com>
+|1|Alashov Berkeli <yunus.alashow@gmail.com>|
-     1 | Alexandr Nesterenko <kuchaspama@gmail.com>
+|1|Alejandro Rodríguez <arcxyz@users.noreply.github.com>|
-     1 | Alexandre Abita <xouabita@gmail.com>
+|1|Alex Bogdanovski <alex@erudika.com>|
-     1 | Alexey Strokach <alex.strokach@utoronto.ca>
+|1|Alex Fornuto <alex@fornuto.com>|
-     1 | Alfred Bez <alfred.bez@googlemail.com>
+|1|Alex Yumashev <33555768+alex-jitbit@users.noreply.github.com>|
-     1 | Alys <alice.harris@oldgods.net>
+|1|Alexandr Nesterenko <kuchaspama@gmail.com>|
-     1 | Andre <andre.lehmann@posteo.de>
+|1|Alexandre Abita <xouabita@gmail.com>|
-     1 | Andrew Murray <radarhere@gmail.com>
+|1|Alexey Strokach <alex.strokach@utoronto.ca>|
-     1 | Andrew Nesbitt <andrewnez@gmail.com>
+|1|Alfred Bez <alfred.bez@googlemail.com>|
-     1 | Andrew Prokhorenkov <andrew.prokhorenkov@gmail.com>
+|1|Alys <alice.harris@oldgods.net>|
-     1 | Andrew Rylatt <andrew.rylatt@citrix.com>
+|1|Andre <andre.lehmann@posteo.de>|
-     1 | Andrey <andrey200964@yandex.ru>
+|1|Andrew Murray <radarhere@gmail.com>|
-     1 | Andrey Kuznetsov <fear@loathing.in>
+|1|Andrew Nesbitt <andrewnez@gmail.com>|
-     1 | André Rodier <arodier@users.noreply.github.com>
+|1|Andrew Prokhorenkov <andrew.prokhorenkov@gmail.com>|
-     1 | Andy Olsen <andrewolsen@mail.adelphi.edu>
+|1|Andrey <andrey200964@yandex.ru>|
-     1 | Angel Velasquez <angvp@archlinux.org>
+|1|Andrey Kuznetsov <fear@loathing.in>|
-     1 | Anton Troyanov <anton@troyanov.net>
+|1|André Rodier <arodier@users.noreply.github.com>|
-     1 | Arda Kılıçdağı <ardakilicdagi@gmail.com>
+|1|Andy Olsen <andrewolsen@mail.adelphi.edu>|
-     1 | Armando Lüscher <armando@noplanman.ch>
+|1|Angel Velasquez <angvp@archlinux.org>|
-     1 | Arnold Schrijver <aschrijver@users.noreply.github.com>
+|1|Anton Troyanov <anton@troyanov.net>|
-     1 | ArthurHoaro <arthur@hoa.ro>
+|1|Arda Kılıçdağı <ardakilicdagi@gmail.com>|
-     1 | Austin <austi_gillm935@ahapps.anoka.k12.mn.us>
+|1|Armando Lüscher <armando@noplanman.ch>|
-     1 | Bas <mega@ioexception.at>
+|1|Arnold Schrijver <aschrijver@users.noreply.github.com>|
-     1 | Beard of War <rebelgeek@blainsmith.com>
+|1|ArthurHoaro <arthur@hoa.ro>|
-     1 | Ben <ben@rngr.org>
+|1|Austin <austi_gillm935@ahapps.anoka.k12.mn.us>|
-     1 | Benjamin Lange <benjamin.r.lange@gmail.com>
+|1|Bas <mega@ioexception.at>|
-     1 | Bob Mottram <bob@robotics.uk.to>
+|1|Beard of War <rebelgeek@blainsmith.com>|
-     1 | Brett <brettex@hotmail.com>
+|1|Ben <ben@rngr.org>|
-     1 | Brian <bdmorin@users.noreply.github.com>
+|1|Benjamin Lange <benjamin.r.lange@gmail.com>|
-     1 | Burung Hantu <privacytoolsIO@users.noreply.github.com>
+|1|Bob Mottram <bob@robotics.uk.to>|
-     1 | C.J. Jameson <cjcjameson@gmail.com>
+|1|Brett <brettex@hotmail.com>|
-     1 | Caleb Xu <calebcenter@live.com>
+|1|Brian <bdmorin@users.noreply.github.com>|
-     1 | Calle Wolff <carl@wolff.se>
+|1|Burung Hantu <privacytoolsIO@users.noreply.github.com>|
-     1 | Carlos Rodriguez <carlos@s8f.org>
+|1|C.J. Jameson <cjcjameson@gmail.com>|
-     1 | Chanchal Kumar Ghosh <chanchal_ghosh1987@yahoo.co.in>
+|1|Caleb Xu <calebcenter@live.com>|
-     1 | Chandan Rai <dev.chandan.rai@gmail.com>
+|1|Calle Wolff <carl@wolff.se>|
-     1 | Charles Barnes <cbarnes@bullhorn.com>
+|1|Carlos Rodriguez <carlos@s8f.org>|
-     1 | Chema <neo22s@gmail.com>
+|1|Chanchal Kumar Ghosh <chanchal_ghosh1987@yahoo.co.in>|
-     1 | Christoph (Sheogorath) Kern <sheogorath@shivering-isles.com>
+|1|Chandan Rai <dev.chandan.rai@gmail.com>|
-     1 | Christoph Kappestein <k42b3.x@gmail.com>
+|1|Charles Barnes <cbarnes@bullhorn.com>|
-     1 | Christoph Wiechert <wio@psitrax.de>
+|1|Chema <neo22s@gmail.com>|
-     1 | Christophe Hamerling <christophe.hamerling@gmail.com>
+|1|Christoph (Sheogorath) Kern <sheogorath@shivering-isles.com>|
-     1 | Clément AUBIN <caubin@caubin.fr>
+|1|Christoph Kappestein <k42b3.x@gmail.com>|
-     1 | Colin <16247799+cpdevelops@users.noreply.github.com>
+|1|Christoph Wiechert <wio@psitrax.de>|
-     1 | Colin Shea <colin@evaryont.me>
+|1|Christophe Hamerling <christophe.hamerling@gmail.com>|
-     1 | Craig Davison <craig@davison.io>
+|1|Clément AUBIN <caubin@caubin.fr>|
-     1 | Cristian Menghi <cristian@menghi.biz>
+|1|Colin <16247799+cpdevelops@users.noreply.github.com>|
-     1 | CyrilPepito <18053589+CyrilPepito@users.noreply.github.com>
+|1|Colin Shea <colin@evaryont.me>|
-     1 | Damir Gainetdinov <damir.gaynetdinov@gmail.com>
+|1|Craig Davison <craig@davison.io>|
-     1 | Dan <rocks.in.the.cloud@gmail.com>
+|1|Cristian Menghi <cristian@menghi.biz>|
-     1 | David Baldwynn <whitef0x0@users.noreply.github.com>
+|1|CyrilPepito <18053589+CyrilPepito@users.noreply.github.com>|
-     1 | David Ng <david90@users.noreply.github.com>
+|1|Damir Gainetdinov <damir.gaynetdinov@gmail.com>|
-     1 | David Yu <david.yu.ftw@gmail.com>
+|1|Dan <rocks.in.the.cloud@gmail.com>|
-     1 | Denis <isdn@users.noreply.github.com>
+|1|Danny <dannyvankooten@gmail.com>|
-     1 | Diego Molina <diemol@users.noreply.github.com>
+|1|David Baldwynn <whitef0x0@users.noreply.github.com>|
-     1 | Dirk Krause <dirkk0@googlemail.com>
+|1|David Ng <david90@users.noreply.github.com>|
-     1 | Dmitriy Volkov <wldhx+vcs+github_com@wldhx.me>
+|1|David Yu <david.yu.ftw@gmail.com>|
-     1 | Dmitry Khomutov <poisoncorpsee@gmail.com>
+|1|Denis <isdn@users.noreply.github.com>|
-     1 | Doğan Çelik <dogancelik@users.noreply.github.com>
+|1|Denis <issden@gmail.com>|
-     1 | Dražen Lučanin <kermit666@gmail.com>
+|1|Diego Molina <diemol@users.noreply.github.com>|
-     1 | Ed Tewiah <etewiah@hotmail.com>
+|1|Dirk Krause <dirkk0@googlemail.com>|
-     1 | Edreih Aldana <edreihaldana@yahoo.com>
+|1|Dmitriy Volkov <wldhx+vcs+github_com@wldhx.me>|
-     1 | Eike Kettner <eike.kettner@posteo.de>
+|1|Dmitry Khomutov <poisoncorpsee@gmail.com>|
-     1 | Emeric POUPON <epoupon@users.noreply.github.com>
+|1|Doğan Çelik <dogancelik@users.noreply.github.com>|
-     1 | Eran Chetz <eran.chetzroni@algolia.com>
+|1|Dražen Lučanin <kermit666@gmail.com>|
-     1 | Eren Hatırnaz <erenhatirnaz@hotmail.com.tr>
+|1|Ed Tewiah <etewiah@hotmail.com>|
-     1 | Eric Moon <eric@ericmoon.net>
+|1|Edreih Aldana <edreihaldana@yahoo.com>|
-     1 | Ethan Madden <crazeh.monkeh@gmail.com>
+|1|Eike Kettner <eike.kettner@posteo.de>|
-     1 | Eugen <eugen@zeonfederated.com>
+|1|Emeric POUPON <epoupon@users.noreply.github.com>|
-     1 | Evelthon Prodromou <epro@prodromou.eu>
+|1|Emlembow <36314674+Emlembow@users.noreply.github.com>|
-     1 | Fazal Majid <github@sentfrom.com>
+|1|Eran Chetz <eran.chetzroni@algolia.com>|
-     1 | Florian Kaiser <florian.kaiser@fnkr.net>
+|1|Eren Hatırnaz <erenhatirnaz@hotmail.com.tr>|
-     1 | Florian Wilhelm <f.wilhelm@tarent.de>
+|1|Eric Moon <eric@ericmoon.net>|
-     1 | FortressBuilder <FortressBuilder@users.noreply.github.com>
+|1|Ethan Madden <crazeh.monkeh@gmail.com>|
-     1 | Girish Ramakrishnan <mail@girish.in>
+|1|Eugen <eugen@zeonfederated.com>|
-     1 | Greg Chetcuti <greg@chetcuti.com>
+|1|Evelthon Prodromou <epro@prodromou.eu>|
-     1 | Guilherme Oenning <me@goenning.net>
+|1|Fazal Majid <github@sentfrom.com>|
-     1 | Herman Zvonimir Došilović <hermanz.dosilovic@gmail.com>
+|1|Florian Kaiser <florian.kaiser@fnkr.net>|
-     1 | IAlwaysBeCoding <erik.dominguez1003@gmail.com>
+|1|Florian Wilhelm <f.wilhelm@tarent.de>|
-     1 | Icantcodeatall <francois.lachese@me.com>
+|1|FortressBuilder <FortressBuilder@users.noreply.github.com>|
-     1 | Igor Antun <IgorAntun@users.noreply.github.com>
+|1|Girish Ramakrishnan <mail@girish.in>|
-     1 | Igor Petrov <garik.piton@gmail.com>
+|1|Greg Chetcuti <greg@chetcuti.com>|
-     1 | Ivan Krutov <vania-pooh@vania-pooh.com>
+|1|Guilherme Oenning <me@goenning.net>|
-     1 | Izac Lorimer <izaclorimer@users.noreply.github.com>
+|1|Herman Zvonimir Došilović <hermanz.dosilovic@gmail.com>|
-     1 | Jack <jackdev@mailbox.org>
+|1|IAlwaysBeCoding <erik.dominguez1003@gmail.com>|
-     1 | Jakob Gillich <jakob@gillich.me>
+|1|Icantcodeatall <francois.lachese@me.com>|
-     1 | James Mills <prologic@shortcircuit.net.au>
+|1|Igor Antun <IgorAntun@users.noreply.github.com>|
-     1 | Jan <jayphizzle@users.noreply.github.com>
+|1|Igor Petrov <garik.piton@gmail.com>|
-     1 | Jannik Anker <jannikanker@users.noreply.github.com>
+|1|Ivan Krutov <vania-pooh@vania-pooh.com>|
-     1 | Janos Dobronszki <dobronszki@gmail.com>
+|1|Izac Lorimer <izaclorimer@users.noreply.github.com>|
-     1 | Jarek Lipski <pub@loomchild.net>
+|1|Jack <jackdev@mailbox.org>|
-     1 | Jay Williams <jay@myd3.com>
+|1|Jakob Gillich <jakob@gillich.me>|
-     1 | Jay Yu <GitHubGeek@users.noreply.github.com>
+|1|James Mills <prologic@shortcircuit.net.au>|
-     1 | Jean Menezes da Rocha <jean@menezesdarocha.info>
+|1|Jan <jayphizzle@users.noreply.github.com>|
-     1 | Jeremiah Marks <jeremiah@jlmarks.org>
+|1|Jannik Anker <jannikanker@users.noreply.github.com>|
-     1 | Joel Calado <joelcalado@gmail.com>
+|1|Janos Dobronszki <dobronszki@gmail.com>|
-     1 | Josh Harmon <me@joshharmon.me>
+|1|Jarek Lipski <pub@loomchild.net>|
-     1 | Joshua Hamilton <joshua.hamilton@fabricut.com>
+|1|Jay Williams <jay@myd3.com>|
-     1 | José Castro <cogurov@gmail.com>
+|1|Jay Yu <GitHubGeek@users.noreply.github.com>|
-     1 | Julien <bibich@users.noreply.github.com>
+|1|Jean Menezes da Rocha <jean@menezesdarocha.info>|
-     1 | Julien Bisconti <julien.bisconti@gmail.com>
+|1|Jelmer Vernooĳ <jelmer@jelmer.uk>|
-     1 | Julien Reichardt <jul.reich43@opmbx.org>
+|1|Jeremiah Marks <jeremiah@jlmarks.org>|
-     1 | Justin Clift <justin@postgresql.org>
+|1|Joel Calado <joelcalado@gmail.com>|
-     1 | Justin O'Reilly <justin@oreilly.me>
+|1|Josh Harmon <me@joshharmon.me>|
-     1 | KarloLuiten <github@karloluiten.nl>
+|1|Joshua Hamilton <joshua.hamilton@fabricut.com>|
-     1 | Ketrel <webmaster@krahs-emag.com>
+|1|José Castro <cogurov@gmail.com>|
-     1 | Kevin Lin <LINKIWI@users.noreply.github.com>
+|1|Julien <bibich@users.noreply.github.com>|
-     1 | Keyhaku <jones@bious.fr>
+|1|Julien Bisconti <julien.bisconti@gmail.com>|
-     1 | Kieran <kieran.brahney@gmail.com>
+|1|Julien Reichardt <jul.reich43@opmbx.org>|
-     1 | Kim Jahn <gitfuckinghub@maisspace.org>
+|1|Justin Clift <justin@postgresql.org>|
-     1 | Konstantin Sorokin <kvs@sigterm.ru>
+|1|Justin O'Reilly <justin@oreilly.me>|
-     1 | Kukielka <philipp_kutyla@gmx.de>
+|1|KarloLuiten <github@karloluiten.nl>|
-     1 | Kyle Farwell <m@kfarwell.org>
+|1|Ketrel <webmaster@krahs-emag.com>|
-     1 | Kyle Stetz <kylestetz@gmail.com>
+|1|Kevin Lin <LINKIWI@users.noreply.github.com>|
-     1 | LB (Ben Johnston) <mail@lb.ee>
+|1|Keyhaku <jones@bious.fr>|
-     1 | Lescaudron Mathieu <mathieu@lescaudron.com>
+|1|Kieran <kieran.brahney@gmail.com>|
-     1 | Liran Tal <liran.tal@gmail.com>
+|1|Kim Jahn <gitfuckinghub@maisspace.org>|
-     1 | Marcin Karpezo <m.karpezo@nencki.gov.pl>
+|1|Konstantin Sorokin <kvs@sigterm.ru>|
-     1 | Marco Dickert <dickert.marco@gmail.com>
+|1|Kukielka <philipp_kutyla@gmx.de>|
-     1 | Marcus Ramberg <marcus@nordaaker.com>
+|1|Kyle Farwell <m@kfarwell.org>|
-     1 | Mark Ide <git@cranstonide.com>
+|1|Kyle Stetz <kylestetz@gmail.com>|
-     1 | Mark Ide <mark@cranstonide.com>
+|1|LB (Ben Johnston) <mail@lb.ee>|
-     1 | Mark Railton <mark@markrailton.com>
+|1|Lescaudron Mathieu <mathieu@lescaudron.com>|
-     1 | Martin Malinda <malindacz@gmail.com>
+|1|Liran Tal <liran.tal@gmail.com>|
-     1 | Marvin <Groruk@uberdoge.network>
+|1|Marcin Karpezo <m.karpezo@nencki.gov.pl>|
-     1 | MatFluor <MatFluor@users.noreply.github.com>
+|1|Marco Dickert <dickert.marco@gmail.com>|
-     1 | Matt Lee <mattl@users.noreply.github.com>
+|1|Marco Kamner <marco@it-kamner.de>|
-     1 | Matteo Piccina <matteo@beiphone.it>
+|1|Marcus Ramberg <marcus@nordaaker.com>|
-     1 | Matthew Dews <matthew-dews@users.noreply.github.com>
+|1|Mark Ide <git@cranstonide.com>|
-     1 | Matthew East <matthew@mattheweast.me>
+|1|Mark Ide <mark@cranstonide.com>|
-     1 | Michael Barrow <michael@barrow.me>
+|1|Mark Railton <mark@markrailton.com>|
-     1 | Michael Burns <michael@mirwin.net>
+|1|Martin Malinda <malindacz@gmail.com>|
-     1 | Michael Malura <github@malura.me>
+|1|Marvin <Groruk@uberdoge.network>|
-     1 | Michael van Tricht <mvantricht@expandonline.nl>
+|1|MatFluor <MatFluor@users.noreply.github.com>|
-     1 | Michael van Tricht <swordbeta@users.noreply.github.com>
+|1|Matt Lee <mattl@users.noreply.github.com>|
-     1 | Mike Goodwin <xenithorb@users.noreply.github.com>
+|1|Matteo Piccina <matteo@beiphone.it>|
-     1 | Mike Steele <mike@steel.fm>
+|1|Matthew Dews <matthew-dews@users.noreply.github.com>|
-     1 | MinorTom <TheMinorTom@users.noreply.github.com>
+|1|Matthew East <matthew@mattheweast.me>|
-     1 | Moritz Kröger <write@morkro.de>
+|1|Michael Barrow <michael@barrow.me>|
-     1 | Murdoc Bates <trockenasche@gmail.com>
+|1|Michael Burns <michael@mirwin.net>|
-     1 | NicolasCARPi <nicolas.carpi@curie.fr>
+|1|Michael Malura <github@malura.me>|
-     1 | Norman Xu <im@norm.im>
+|1|Michael van Tricht <mvantricht@expandonline.nl>|
-     1 | Nÿco <nicolas.verite@gmail.com>
+|1|Michael van Tricht <swordbeta@users.noreply.github.com>|
-     1 | Ober7 <k.latif.misc@gmail.com>
+|1|Mike Goodwin <xenithorb@users.noreply.github.com>|
-     1 | Oliver Kopp <kopp.dev@gmail.com>
+|1|Mike Steele <mike@steel.fm>|
-     1 | Opeyemi Obembe <fickledreams@yahoo.com>
+|1|MinorTom <TheMinorTom@users.noreply.github.com>|
-     1 | Paolo Pustorino <stickgrinder@gmail.com>
+|1|Mitchell R <github@mrincworld.com>|
-     1 | Pau Kiat Wee <paukiatwee@gmail.com>
+|1|Moritz Kröger <write@morkro.de>|
-     1 | Paul <paul@rosanbo.com>
+|1|Murdoc Bates <trockenasche@gmail.com>|
-     1 | Pavlo Vodopyan <pavel.vodopyan@gmail.com>
+|1|NicolasCARPi <nicolas.carpi@curie.fr>|
-     1 | Paweł Kapała <bylek77@gmail.com>
+|1|Norman Xu <im@norm.im>|
-     1 | Peter Brunner <pbrunner@gmail.com>
+|1|Nÿco <nicolas.verite@gmail.com>|
-     1 | Peter van den Hurk <runical1991@gmail.com>
+|1|Ober7 <k.latif.misc@gmail.com>|
-     1 | Phill <phill@formbet.co.uk>
+|1|Oleg Agafonov <oleg.agafonov@telestax.com>|
-     1 | Phonic Mouse <phonicmouse@gmai.com>
+|1|Oliver Kopp <kopp.dev@gmail.com>|
-     1 | Prahalad Belavadi <prahaladbelavadi@gmail.com>
+|1|Opeyemi Obembe <fickledreams@yahoo.com>|
-     1 | Rafael Milewski <Milewski@users.noreply.github.com>
+|1|Paolo Pustorino <stickgrinder@gmail.com>|
-     1 | Remi Rampin <remirampin@gmail.com>
+|1|Pau Kiat Wee <paukiatwee@gmail.com>|
-     1 | Remy Adriaanse <remy@adriaanse.it>
+|1|Paul <paul@rosanbo.com>|
-     1 | Remy Honig <remyhonig@users.noreply.github.com>
+|1|Pavlo Vodopyan <pavel.vodopyan@gmail.com>|
-     1 | Riddler <Iamjithin@live.com>
+|1|Paweł Kapała <bylek77@gmail.com>|
-     1 | Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
+|1|Peter Brunner <pbrunner@gmail.com>|
-     1 | RussellAult <RussellAult@users.noreply.github.com>
+|1|Peter van den Hurk <runical1991@gmail.com>|
-     1 | Ryan Halliday <ry167@ry167.com>
+|1|Phill <phill@formbet.co.uk>|
-     1 | Ryan Noelk <ryannoelk@gmail.com>
+|1|Phonic Mouse <phonicmouse@gmai.com>|
-     1 | Sahin Boydas <sahin@movielala.com>
+|1|Prahalad Belavadi <prahaladbelavadi@gmail.com>|
-     1 | Salvatore Gentile <SalGnt@users.noreply.github.com>
+|1|Rafael Milewski <Milewski@users.noreply.github.com>|
-     1 | Sam Wilson <sam@samwilson.id.au>
+|1|Remi Rampin <remirampin@gmail.com>|
-     1 | Samuel Garneau <sam@garno.me>
+|1|Remy Adriaanse <remy@adriaanse.it>|
-     1 | Scott Humphries <sscotth@users.noreply.github.com>
+|1|Remy Honig <remyhonig@users.noreply.github.com>|
-     1 | Senan Kelly <senan.f.b.kelly+github@gmail.com>
+|1|Riddler <Iamjithin@live.com>|
-     1 | Sergey Bronnikov <sergeyb@bronevichok.ru>
+|1|Roberto Rosario <roberto.rosario.gonzalez@gmail.com>|
-     1 | Sheldon Rupp <me@shel.io>
+|1|RussellAult <RussellAult@users.noreply.github.com>|
-     1 | Simon Hanna <simon.hanna@jesus.de>
+|1|Ryan Halliday <ry167@ry167.com>|
-     1 | Spencer McIntyre <zeroSteiner@gmail.com>
+|1|Ryan Noelk <ryannoelk@gmail.com>|
-     1 | Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
+|1|Sahin Boydas <sahin@movielala.com>|
-     1 | Stefan Weil <sw@weilnetz.de>
+|1|Salvatore Gentile <SalGnt@users.noreply.github.com>|
-     1 | Steve Divskinsy <stevesbrain@users.noreply.github.com>
+|1|Sam Wilson <sam@samwilson.id.au>|
-     1 | Sylvain Boily <sylvainboilydroid@gmail.com>
+|1|Samuel Garneau <sam@garno.me>|
-     1 | THS-on <THS-on@users.noreply.github.com>
+|1|Scott Humphries <sscotth@users.noreply.github.com>|
-     1 | Tanner Collin <git@tannercollin.com>
+|1|Senan Kelly <senan.f.b.kelly+github@gmail.com>|
-     1 | The Scorpion <tehscorpion@users.noreply.github.com>
+|1|Sergey Bronnikov <sergeyb@bronevichok.ru>|
-     1 | Thorsten Rinne <thorsten@phpmyfaq.de>
+|1|Sheldon Rupp <me@shel.io>|
-     1 | Tim Allingham <tim@timallingham.net>
+|1|Simon Hanna <simon.hanna@jesus.de>|
-     1 | Tobias Diekershoff <tobias.diekershoff@gmx.net>
+|1|Spencer McIntyre <zeroSteiner@gmail.com>|
-     1 | Tobias Kunze <rixx@cutebit.de>
+|1|Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>|
-     1 | Tobias Zeising <tobias.zeising@aditu.de>
+|1|Stefan Weil <sw@weilnetz.de>|
-     1 | Tom Hacohen <tom@stosb.com>
+|1|Steve Divskinsy <stevesbrain@users.noreply.github.com>|
-     1 | Tommy Ku <tommyku@users.noreply.github.com>
+|1|Sylvain Boily <sylvainboilydroid@gmail.com>|
-     1 | Viktor Geringer <devfakeplus@googlemail.com>
+|1|THS-on <THS-on@users.noreply.github.com>|
-     1 | Yurii Rashkovskii <yrashk@gmail.com>
+|1|Tanner Collin <git@tannercollin.com>|
-     1 | axeloz <axel@mabox.eu>
+|1|The Scorpion <tehscorpion@users.noreply.github.com>|
-     1 | benmaynard11 <allowin-217941-github@vhost244.maynardnetworks.com>
+|1|Thorsten Rinne <thorsten@phpmyfaq.de>|
-     1 | bricej13 <bricej13@gmail.com>
+|1|Tim Allingham <tim@timallingham.net>|
-     1 | cbdev <cb@cbcdn.com>
+|1|Tobias Diekershoff <tobias.diekershoff@gmx.net>|
-     1 | cpdev <cpdevelops@users.noreply.github.com>
+|1|Tobias Kunze <rixx@cutebit.de>|
-     1 | dimqua <dimqua@lavabit.com>
+|1|Tobias Zeising <tobias.zeising@aditu.de>|
-     1 | disk0x <mdtha@tutanota.com>
+|1|Tom Hacohen <tom@stosb.com>|
-     1 | domainzero <domainzero@users.noreply.github.com>
+|1|Tommy Ku <tommyku@users.noreply.github.com>|
-     1 | dsx <free.robots@gmail.com>
+|1|Vadim Markovtsev <vadim@sourced.tech>|
-     1 | ePirat <epirat07@gmail.com>
+|1|Viktor Geringer <devfakeplus@googlemail.com>|
-     1 | emeric <itmfr@yahoo.fr>
+|1|William Gathoye <william@gathoye.be>|
-     1 | evitalis <evitalis@users.noreply.github.com>
+|1|Yurii Rashkovskii <yrashk@gmail.com>|
-     1 | florianl <florianl@users.noreply.github.com>
+|1|axeloz <axel@mabox.eu>|
-     1 | foorb <foorb@users.noreply.github.com>
+|1|benmaynard11 <allowin-217941-github@vhost244.maynardnetworks.com>|
-     1 | ghaseminya <ghaseminya@gmail.com>
+|1|bricej13 <bricej13@gmail.com>|
-     1 | golangci <35628013+golangci@users.noreply.github.com>
+|1|cbdev <cb@cbcdn.com>|
-     1 | ice-92 <ice-92@users.noreply.github.com>
+|1|cpdev <cpdevelops@users.noreply.github.com>|
-     1 | ilsi <ilsi@users.noreply.github.com>
+|1|dimqua <dimqua@lavabit.com>|
-     1 | itsnotv <itsnotv@users.noreply.github.com>
+|1|disk0x <mdtha@tutanota.com>|
-     1 | jake <jake@diesel>
+|1|domainzero <domainzero@users.noreply.github.com>|
-     1 | josh <joshua.r.li.98@gmail.com>
+|1|dsx <free.robots@gmail.com>|
-     1 | lachlan-00 <lachlan.00@gmail.com>
+|1|ePirat <epirat07@gmail.com>|
-     1 | littleguga <littleguga@users.noreply.github.com>
+|1|emeric <itmfr@yahoo.fr>|
-     1 | lsascha <lsascha@gmail.com>
+|1|evitalis <evitalis@users.noreply.github.com>|
-     1 | macmusz <m.muszytowski@simplito.com>
+|1|florianl <florianl@users.noreply.github.com>|
-     1 | memorex258 <phillip.a.brown@live.com>
+|1|foorb <foorb@users.noreply.github.com>|
-     1 | mertinop <martin.santibanez.a@gmail.com>
+|1|ghaseminya <ghaseminya@gmail.com>|
-     1 | mrkpl125 <33229813+mrkpl125@users.noreply.github.com>
+|1|golangci <35628013+golangci@users.noreply.github.com>|
-     1 | n2i <xuansamdinh.n2i@gmail.com>
+|1|ice-92 <ice-92@users.noreply.github.com>|
-     1 | nodomain <ff@nodomain.cc>
+|1|ilsi <ilsi@users.noreply.github.com>|
-     1 | pastapojken <pastapojken@users.noreply.github.com>
+|1|itsnotv <itsnotv@users.noreply.github.com>|
-     1 | pips <pips@e5150.fr>
+|1|jake <jake@diesel>|
-     1 | poVoq <wm_jkm@yahoo.com>
+|1|jgi <public-devgit-common@gissehel.org>|
-     1 | railscard <railscard@gmail.com>
+|1|josh <joshua.r.li.98@gmail.com>|
-     1 | sc0repi0 <sc0repi0@gmx.de>
+|1|lachlan-00 <lachlan.00@gmail.com>|
-     1 | skarphet <skarphet@users.noreply.github.com>
+|1|littleguga <littleguga@users.noreply.github.com>|
-     1 | sqozz <sqozz@geekify.de>
+|1|lsascha <lsascha@gmail.com>|
-     1 | steven jacobs <stjacobs@fastmail.fm>
+|1|macmusz <m.muszytowski@simplito.com>|
-     1 | stevesbrain <stevesbrain@users.noreply.github.com>
+|1|memorex258 <phillip.a.brown@live.com>|
-     1 | t1st3 <contact@tiste.org>
+|1|mertinop <martin.santibanez.a@gmail.com>|
-     1 | teaberryy <ekisneels@gmail.com>
+|1|mrkpl125 <33229813+mrkpl125@users.noreply.github.com>|
-     1 | timbe16 <timbe16@users.noreply.github.com>
+|1|n2i <xuansamdinh.n2i@gmail.com>|
-     1 | trebonius0 <trebonius@worldofwargraphs.com>
+|1|nodomain <ff@nodomain.cc>|
-     1 | ttoups <ich@timotoups.de>
+|1|pastapojken <pastapojken@users.noreply.github.com>|
-     1 | uchchishta <uchchishta@users.noreply.github.com>
+|1|pips <pips@e5150.fr>|
-     1 | vincent-clipet <vincent.clipet.7@gmail.com>
+|1|poVoq <wm_jkm@yahoo.com>|
-     1 | vinz243 <vinz243@opmbx.org>
+|1|railscard <railscard@gmail.com>|
-     1 | wxcafé <wxcafe@wxcafe.net>
+|1|sc0repi0 <sc0repi0@gmx.de>|
-     1 | xuansamdinh <xuansamdinh.n2i@gmail.com>
+|1|skarphet <skarphet@users.noreply.github.com>|
-     1 | zotlabs <mike@macgirvin.com>
+|1|sqozz <sqozz@geekify.de>|
-     1 | Руслан Корнев <oganer@gmail.com>
+|1|steven jacobs <stjacobs@fastmail.fm>|
-     1 | ProfessorLogout <Marco Kamner>
+|1|stevesbrain <stevesbrain@users.noreply.github.com>|
 |1|t1st3 <contact@tiste.org>|
 |1|teaberryy <ekisneels@gmail.com>|
 |1|timbe16 <timbe16@users.noreply.github.com>|
 |1|trebonius0 <trebonius@worldofwargraphs.com>|
 |1|ttoups <ich@timotoups.de>|
 |1|uchchishta <uchchishta@users.noreply.github.com>|
 |1|vincent-clipet <vincent.clipet.7@gmail.com>|
 |1|vinz243 <vinz243@opmbx.org>|
 |1|wxcafé <wxcafe@wxcafe.net>|
 |1|xuansamdinh <xuansamdinh.n2i@gmail.com>|
 |1|zotlabs <mike@macgirvin.com>|
 |1|Руслан Корнев <oganer@gmail.com>|
--- a/2
+++ b/2
@ -30,7 +30,7 @@ syntaxerrors:
 	@! sed -n -e '/BEGIN SOFTWARE LIST/,/END SOFTWARE LIST/ p' README.md | egrep  '\)\(|``|\)`'
 contrib:
-	@mv .github/.mailmap . && printf "Commits | Author \n:---: | ---\n" > AUTHORS.md && git shortlog -sne >> AUTHORS.md && sed -i 's/\t/ | /g' AUTHORS.md && mv .mailmap .github/.mailmap
+	@mv .github/.mailmap . && printf "|Commits | Author |\n| :---: | --- |\n" > AUTHORS.md && git shortlog -sne | sed -r 's/^\s*([[:digit:]]*?)\s*?(.*?)/|\1|\2|/' >> AUTHORS.md && mv .mailmap .github/.mailmap
 add:
 	@#add a new entry
--- a/README.md
+++ b/README.md
@ -10,85 +10,83 @@ See [Contributing](.github/CONTRIBUTING.md).
 --------------------
- [Analytics](#analytics)
+- List of Software
-  - [Web Analytics](#web-analytics)
+  - [Analytics](#analytics)
-  - [Social Media Analyics](#social-media-analytics)
+  - [Archiving and Digital Preservation (DP)](#archiving-and-digital-preservation-dp)
-  - [Business Intelligence](#business-intelligence)
+  - [Automation](#automation)
- [Archiving and Digital Preservation (DP)](#archiving-and-digital-preservation-dp)
+  - [Blogging Platforms](#blogging-platforms)
- [Automation](#automation)
+  - [Bookmarks and Link Sharing](#bookmarks-and-link-sharing)
- [Blogging Platforms](#blogging-platforms)
+  - [Calendaring and Contacts Management](#calendaring-and-contacts-management)
- [Bookmarks and Link Sharing](#bookmarks-and-link-sharing)
+  - [Communication systems](#communication-systems)
- [Calendaring and Contacts Management](#calendaring-and-contacts-management)
+    - [Custom communication systems](#custom-communication-systems)
- [Communication systems](#communication-systems)
+    - [Email](#email)
-  - [Custom communication systems](#custom-communication-systems)
+      - [Complete solutions](#complete-solutions)
-  - [Email](#email)
+      - [Mail Transfer Agents](#mail-transfer-agents)
-    - [Complete solutions](#complete-solutions)
+      - [Mail Delivery Agents](#mail-delivery-agents)
-    - [Mail Transfer Agents](#mail-transfer-agents)
+      - [Mailing lists and newsletters](#mailing-lists-and-newsletters)
-    - [Mail Delivery Agents](#mail-delivery-agents)
+      - [Webmail clients](#webmail-clients)
-    - [Mailing lists and newsletters](#mailing-lists-and-newsletters)
+    - [IRC](#irc)
-    - [Webmail clients](#webmail-clients)
+    - [SIP](#sip)
-  - [IRC](#irc)
+    - [IPBX](#ipbx)
-  - [SIP](#sip)
+    - [Social Networks and Forums](#social-networks-and-forums)
-  - [IPBX](#ipbx)
+    - [XMPP](#xmpp)
-  - [Social Networks and Forums](#social-networks-and-forums)
+      - [XMPP Servers](#xmpp-servers)
-  - [XMPP](#xmpp)
+      - [XMPP Web Clients](#xmpp-web-clients)
-    - [XMPP Servers](#xmpp-servers)
+  - [Conference Management](#conference-management)
-    - [XMPP Web Clients](#xmpp-web-clients)
+  - [Content Management Systems (CMS)](#content-management-systems-cms)
- [Conference Management](#conference-management)
+    - [E-commerce](#e-commerce)
- [Content Management Systems (CMS)](#content-management-systems-cms)
+  - [DNS](#dns)
-  - [E-commerce](#e-commerce)
+  - [Document Management](#document-management)
- [DNS](#dns)
+  - [E-books and Integrated Library Systems (ILS)](#e-books-and-integrated-library-systems-ils)
- [Document Management](#document-management)
+  - [Enterprise Resource Planning](#enterprise-resource-planning)
- [E-books and Integrated Library Systems (ILS)](#e-books-and-integrated-library-systems-ils)
+  - [Federated Identity/Authentication](#federated-identityauthentication)
- [Enterprise Resource Planning](#enterprise-resource-planning)
+  - [Feed Readers](#feed-readers)
- [Federated Identity/Authentication](#federated-identityauthentication)
+  - [File Sharing and Synchronization](#file-sharing-and-synchronization)
- [Feed Readers](#feed-readers)
+    - [Distributed filesystems](#distributed-filesystems)
- [File Sharing and Synchronization](#file-sharing-and-synchronization)
+    - [File transfer/synchronization](#file-transfersynchronization)
-  - [Distributed filesystems](#distributed-filesystems)
+    - [Peer-to-peer filesharing](#peer-to-peer-filesharing)
-  - [File transfer/synchronization](#file-transfersynchronization)
+    - [Object storage/file servers](#object-storagefile-servers)
-  - [Peer-to-peer filesharing](#peer-to-peer-filesharing)
+    - [Single-click/drag-n-drop upload](#single-clickdrag-n-drop-upload)
-  - [Object storage/file servers](#object-storagefile-servers)
+    - [Web based file managers](#web-based-file-managers)
-  - [Single-click/drag-n-drop upload](#single-clickdrag-n-drop-upload)
+  - [Games](#games)
-  - [Web based file managers](#web-based-file-managers)
+  - [Gateways](#gateways)
- [Games](#games)
+  - [Groupware](#groupware)
- [Gateways](#gateways)
+  - [Human Resources Management (HRM)](#human-resources-management-hrm)
- [Groupware](#groupware)
+  - [Learning and Courses](#learning-and-courses)
- [Human Resources Management (HRM)](#human-resources-management-hrm)
+  - [Maps and Global Positioning System (GPS)](#maps-and-global-positioning-system-gps)
- [Learning Management Systems (LMS) and Courses](#learning-management-systems-lms-and-courses)
+  - [Media Streaming](#media-streaming)
- [Maps and Global Positioning System (GPS)](#maps-and-global-positioning-system-gps)
+    - [Multimedia Streaming](#multimedia-streaming)
- [Media Streaming](#media-streaming)
+    - [Audio Streaming](#audio-streaming)
-  - [Multimedia Streaming](#multimedia-streaming)
+    - [Video Streaming](#video-streaming)
-  - [Audio Streaming](#audio-streaming)
+  - [Misc/Other](#miscother)
-  - [Video Streaming](#video-streaming)
+  - [Money, Budgeting and Management](#money-budgeting-and-management)
- [Misc/Other](#miscother)
+  - [Monitoring](#monitoring)
- [Money, Budgeting and Management](#money-budgeting-and-management)
+  - [Note-taking and Editors](#note-taking-and-editors)
- [Monitoring](#monitoring)
+  - [Office Suites](#office-suites)
- [Note-taking and Editors](#note-taking-and-editors)
+  - [Password Managers](#password-managers)
- [Office Suites](#office-suites)
+  - [Pastebins](#pastebins)
- [Password Managers](#password-managers)
+  - [Personal Dashboards](#personal-dashboards)
- [Pastebins](#pastebins)
+  - [Photo and Video Galleries](#photo-and-video-galleries)
- [Personal Dashboards](#personal-dashboards)
+  - [Polls and Events](#polls-and-events)
- [Photo and Video Galleries](#photo-and-video-galleries)
+  - [Proxy](#proxy)
- [Polls and Events](#polls-and-events)
+  - [Read it Later Lists](#read-it-later-lists)
- [Proxy](#proxy)
+  - [Search Engines](#search-engines)
- [Read it Later Lists](#read-it-later-lists)
+  - [Software Development](#software-development)
- [Search Engines](#search-engines)
+    - [Project Management](#project-management)
- [Software Development](#software-development)
+    - [Bug Trackers](#bug-trackers)
-  - [Project Management](#project-management)
+    - [IDE/Tools](#idetools)
-  - [Bug Trackers](#bug-trackers)
+    - [Continuous Integration](#continuous-integration)
-  - [IDE/Tools](#idetools)
+    - [FaaS/Serverless](#faas-serverless)
-  - [Continuous Integration](#continuous-integration)
+    - [API Management](#api-management)
-  - [FaaS/Serverless](#faas-serverless)
+    - [Documentation Generators](#documentation-generators)
-  - [API Management](#api-management)
+    - [Localization](#localization)
-  - [Documentation Generators](#documentation-generators)
+  - [Static site generators](#static-site-generators)
-  - [Localization](#localization)
+  - [Task management/To-do lists](#task-managementto-do-lists)
- [Static site generators](#static-site-generators)
+  - [Ticketing](#ticketing)
- [Task management/To-do lists](#task-managementto-do-lists)
+  - [URL Shorteners](#url-shorteners)
- [Ticketing](#ticketing)
+  - [VPN](#vpn)
- [URL Shorteners](#url-shorteners)
+  - [Web servers](#web-servers)
- [VPN](#vpn)
+  - [Wikis](#wikis)
 - [Web servers](#web-servers)
 - [Wikis](#wikis)
 - [Self-hosting Solutions](#self-hosting-solutions)
 - [List of Licenses](#list-of-licenses)
 - [External links](#external-links)
@ -111,6 +109,7 @@ For personal analytics/dashboards, see [Personal Dashboards](https://github.com/
 - [Druid](http://druid.io/) - Distributed, column-oriented, real-time analytics data store. ([Source Code](https://github.com/druid-io/druid/)) `Apache-2.0` `Java`
 - [Fathom Analytics](https://usefathom.com) - Simple & trustworthy website analytics. ([Source Code](https://github.com/usefathom/fathom)) `MIT` `Go`
 - [GoAccess](http://goaccess.io/) - Real-time web log analyzer and interactive viewer that runs in a terminal. ([Source Code](https://github.com/allinurl/goaccess)) `GPL-2.0` `C`
 - [Hastic](https://hastic.io) - Hackable time series pattern recognition tool with UI for Grafana. ([Source Code](https://github.com/hastic)) `Apache-2.0` `Python/Nodejs`
 - [Matomo](https://matomo.org/) - Leading open-source analytics platform that gives you more than just powerful analytics, formerly known as Piwik. ([Source Code](https://github.com/matomo-org/)) `GPL-3.0` `PHP`
 - [Open Web Analytics](http://www.openwebanalytics.com/) - Google Analytics and Piwik alternative. ([Source Code](https://github.com/padams/Open-Web-Analytics/)) `GPL-2.0` `PHP`
 - [Rakam](https://rakam.io/) - Custom analytics platform that allows you to create your own analytics services. Integrate with any data source (web, mobile, IoT etc.), analyze data with SQL and create dashboards. ([Source Code](https://github.com/rakam-io/rakam)) `Apache-2.0` `Java`
@ -146,9 +145,10 @@ Some [Content Management System](#content-management-systems-cms) solutions also
 - [Alltube](http://www.alltubedownload.net) - Web interface for [youtube-dl](https://github.com/rg3/youtube-dl), a program to download videos and audio from [more than 100 websites](https://rg3.github.io/youtube-dl/supportedsites.html). ([Demo](http://www.alltubedownload.net), [Source Code](https://github.com/Rudloff/alltube)) `GPL-3.0` `PHP`
 - [AmIUnique](https://amiunique.org/) - Learn how identifiable you are on the Internet (browser fingerprinting tool). ([Source Code](https://github.com/DIVERSIFY-project/amiunique)) `MIT` `Java`
 - [Beehive](https://github.com/muesli/beehive) - Flexible event and agent system, which allows you to create your own agents that perform automated tasks triggered by events and filters. `AGPL-3.0` `Go`
 - [CampaignChain](https://www.campaignchain.com/) `⚠` - A marketing hub allowing to schedule posts on social media (a la Hootsuite+Buffer) and combine them with newsletter campaigns. ([Source Code](https://github.com/CampaignChain/campaignchain/tree/1.0)) `Apache-2.0` `PHP`
 - [CouchPotato](https://couchpota.to/) - CouchPotato is an automatic Video Library Manager for Movies. Automatic torrent/nzb searching, downloading, and processing at the qualities you want. ([Source Code](https://github.com/CouchPotato/CouchPotatoServer/)) `GPL-3.0` `Python`
 - [Episodes](https://github.com/guptachetan1997/Episodes) - `⚠` Self Hosted TV show Episode tracker and recommender built using django, bootstrap4. `MIT` `Python`
- [feedmixer](https://github.com/cristoper/feedmixer) - FeedMixer is a WSGI (Python3) micro web service which takes a list of feed URLs and returns a new feed consisting of the most recent n entries from each given feed. (Returns Atom, RSS, or JSON) ([Demo](https://mretc.net/feedmixer/json?f=http://hnrss.org/newest&f=http://americancynic.net/atom.xml&n=1)) `WTFPL` `Python`
+- [feedmixer](https://github.com/cristoper/feedmixer) - FeedMixer is a WSGI (Python3) micro web service which takes a list of feed URLs and returns a new feed consisting of the most recent n entries from each given feed(Returns Atom, RSS, or JSON). ([Demo](https://mretc.net/feedmixer/json?f=http://hnrss.org/newest&f=http://americancynic.net/atom.xml&n=1)) `WTFPL` `Python`
 - [FHEM](https://fhem.de/fhem.html) - FHEM is used to automate common tasks in the household like switching lamps and heating. It can also be used to log events like temperature or power consumption. You can control it via web or smartphone frontends, telnet or TCP/IP directly. ([Source Code](https://svn.fhem.de/trac)) `GPL-3.0` `Perl`
 - [Gekko](https://gekko.wizb.it/) - Gekko is a Bitcoin TA trading and backtesting bot which support multiple exchanges and cryptocurrencies. ([Source Code](https://github.com/askmike/gekko)) `MIT` `Nodejs`
 - [Headphones](https://github.com/rembo10/headphones) - Automated music downloader for NZB and Torrent, written in Python. It supports SABnzbd, NZBget, Transmission, µTorrent, Deluge and Blackhole. `GPL-3.0` `Python`
@ -158,6 +158,8 @@ Some [Content Management System](#content-management-systems-cms) solutions also
 - [Huginn](https://github.com/cantino/huginn) - Allows you to build agents that monitor and act on your behalf. `MIT` `Ruby`
 - [Http2pic](https://http2pic.haschek.at/) - Website screenshots/renderer. It uses the wkhtmltox to render websites with various options. ([Source Code](https://github.com/chrisiaut/http2pic)) `Apache 2.0` `PHP/Javascript`
 - [Kibitzr](https://kibitzr.github.io) - Lightweight personal web assistant with powerful integrations. ([Source Code](https://github.com/kibitzr/kibitzr/)) `MIT` `Python`
 - [LazyLibrarian](https://github.com/DobyTang/LazyLibrarian) `⚠` - LazyLibrarian is a program to follow authors and grab metadata for all your digital reading needs. It uses a combination of Goodreads Librarything and optionally GoogleBooks as sources for author info and book info. `GPL-3.0` `Python`
 - [Lidarr](https://lidarr.audio/) - Lidarr is a music collection manager for Usenet and BitTorrent users. ([Source Code](https://github.com/Lidarr/Lidarr)) `GPL-3.0` `C#`
 - [Medusa](https://github.com/pymedusa/SickRage) - Automatic Video Library Manager for TV Shows. It watches for new episodes of your favorite shows, and when they are posted it does its magic. `GPL-3.0` `Python`
 - [Node RED](http://nodered.org/) - Browser-based flow editor that helps you wiring hardware devices, APIs and online services to create IoT solutions. ([Source Code](https://github.com/node-red/node-red)) `Apache-2.0` `Nodejs`
 - [openHAB](http://www.openhab.org) - Vendor and technology agnostic open source software for home automation. ([Source Code](https://github.com/openhab/openhab)) `EPL-1.0` `Java`
@ -215,6 +217,7 @@ See also [Static Site Generators](#static-site-generators), [Content Management
 - [saveto](https://save.duyet.net/) - Open source, home for the best links on the web. ([Source Code](https://github.com/saveto-co/saveto)) `MIT` `Nodejs`
 - [SemanticScuttle](http://semanticscuttle.sourceforge.net/) - SemanticScuttle is a social bookmarking tool experimenting with features like structured tags and collaborative tag descriptions. ([Source Code](https://sourceforge.net/p/semanticscuttle/code/ci/master/tree/)) `GPL-2.0` `PHP`
 - [Shaarli](https://github.com/shaarli/Shaarli) - Personal, minimalist, super-fast, no-database bookmarking and link sharing platform. ([Demo](https://demo.shaarli.org)) `Zlib` `PHP`
 - [Shiori](https://github.com/RadhiFadlillah/shiori) - Simple bookmark manager built with Go. `MIT` `Go`
 - [unmark](https://github.com/plainmade/unmark) - Open source to do app for links. `MIT` `PHP`
 - [ymarks](https://bitbucket.org/ymarks/ymarks-server) - Keep your browser's bookmarks synchronized without limiting yourself to one provider. `WTFPL` `C`
@ -267,8 +270,7 @@ _CalDAV or CardDAV clients._
 - [Mattermost](http://www.mattermost.org/) - Open-source, on-prem Slack-alternative. It can be integrated with [Gitlab](https://about.gitlab.com/). ([Source Code](https://github.com/mattermost/platform)) `AGPL-3.0/Apache` `Go`
 - [MiAOU](https://dystroy.org/miaou/login) - Multi-room persistent chat server. ([Source Code](https://github.com/Canop/miaou)) `MIT` `Nodejs`
 - [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)) `BSD` `C++`
+- [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` `C++`
  - [Mumblecop](https://bitbucket.org/Flandoo/mumblecop) - Stream audio from youtube and soundcloud, simulate dice rolls, or write your own commands with a simple plugin format. `MIT` `Ruby`
 - [Niltalk](http://niltalk.com/) - Simple, private, persistence-free web based multi-room chat server + client. ([Source Code](https://github.com/knadh/niltalk)) `AGPL-3.0` `Go`
 - [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`
@ -298,7 +300,7 @@ _Simple deployment of a mail server, e.g. for inexperienced or impatient admins.
 - [docker-mailserver](https://github.com/tomav/docker-mailserver) - Fullstack but simple mail server (smtp, imap, antispam, antivirus, etc.). Only configuration files, no SQL database. Keep it simple and versioned. Easy to deploy and upgrade. `MIT` `Docker`
 - [Inboxen](https://inboxen.org) - Inboxen is a service that provides you with an infinite number of unique inboxes. ([Source Code](https://github.com/Inboxen/Inboxen)) `GPL-3.0` `Python`
- [homebox](https://github.com/progmaticltd/homebox) - A suite of Ansible scripts to deploy a fully functional mail server on Debian. Unobtrusive and automatic as much as possible, focusing on stability and security.  `GPL-3.0` `Shell`
+- [homebox](https://github.com/progmaticltd/homebox) - A suite of Ansible scripts to deploy a fully functional mail server on Debian. Unobtrusive and automatic as much as possible, focusing on stability and security. `GPL-3.0` `Shell`
 - [iRedMail](http://www.iredmail.org/) - Full-featured mail server solution based on Postfix and Dovecot. ([Source Code](https://bitbucket.org/zhb/iredmail/commits/)) `GPL-3.0` `Shell`
 - [Mailcow](https://mailcow.email/) - Mail server suite based on Dovecot, Postfix and other open source software, that provides a modern Web UI for administration. ([Source Code](https://github.com/andryyy/mailcow)) `GPL-2.0` `PHP`
 - [Mailu](https://mailu.io/) - Mailu is a simple yet full-featured mail server as a set of Docker images. ([Demo](https://github.com/Mailu/Mailu/wiki/Demo-server), [Source Code](https://github.com/Mailu/Mailu)) `MIT` `Docker/Python`
@ -350,6 +352,7 @@ _Mailing lists servers and mass mailing software - one message to many recipient
 #### Webmail clients
 - [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`
 - [Mailpile](https://www.mailpile.is/) - Webmail client with search, filtering, encryption features and more. ([Source Code](https://github.com/mailpile/Mailpile)) `AGPL-3.0` `Python`
 - [RainLoop](http://www.rainloop.net/) - Simple, modern and fast webmail with IMAP/SMTP Support and multi accounting. ([Demo](http://demo.rainloop.net/), [Source Code](https://github.com/RainLoop/rainloop-webmail)). `AGPL-3.0` `PHP`
@ -382,6 +385,7 @@ _[SIP](https://en.wikipedia.org/wiki/Session_Initiation_Protocol) telephony soft
 - [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`
 - [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
@ -417,13 +421,13 @@ _[IPBX](https://en.wikipedia.org/wiki/IP_PBX) telephony software_
 - [Hubzilla](https://hubzilla.org) - Decentralized identity, privacy, publishing, sharing, cloud storage, and communications/social platform. ([Source Code](https://github.com/redmatrix/hubzilla)) `MIT` `PHP`
 - [HumHub](https://www.humhub.org/) - Flexible kit for private social networks. ([Source Code](https://github.com/humhub/humhub)) `AGPL-3.0` `PHP`
 - [Isso](http://posativ.org/isso/) - Lightweight commenting server written in Python and Javascript. It aims to be a drop-in replacement for Disqus. ([Source Code](https://github.com/posativ/isso)) `MIT` `Python`
 - [Jappix](https://jappix.com/) - Jappix is an open social platform, that let's you easily get or keep in touch with everyone. ([Source Code](https://github.com/jappix/jappix)) `AGPL-3.0` `PHP`
 - [Loomio](https://www.loomio.org/) - Loomio is a collaborative decision-making tool that makes it easy for anyone to participate in decisions which affect them. ([Source Code](https://github.com/loomio/loomio)) `AGPL-3.0` `Ruby`
 - [Mastodon](https://joinmastodon.org/) - Federated microblogging server, an alternative to GNU social. ([Source Code](https://github.com/tootsuite/mastodon)) `AGPL-3.0` `Ruby`
 - [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`
 - [Newebe](http://newebe.org/) - Distributed Social Network. ([Source Code](https://github.com/gelnior/newebe)) `AGPL-3.0` `Python`
 - [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`
+- [Pleroma](https://pleroma.social) - Federated microblogging server, Mastodon, GNU social, & ActivityPub compatible. ([Source Code](https://git.pleroma.social/pleroma/pleroma)) `AGPL-3.0` `Elixir`
 - [orangeforum](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`
@ -433,6 +437,7 @@ _[IPBX](https://en.wikipedia.org/wiki/IP_PBX) telephony software_
 - [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`
 - [Socialhome](https://socialhome.network) - Federated and decentralized profile builder and social network engine. ([Demo](https://socialhome.network/public/), [Source Code](https://github.com/jaywink/socialhome)) `AGPL-3.0` `Python`
 - [Symphony](https://hacpai.com/) - Modern community (forum/SNS/blog) platform written in Java. ([Source Code](https://github.com/b3log/symphony)) `GPL-3.0` `Java`
 - [Talkyard](https://www.talkyard.io/) - Create a community, where your users can suggest ideas and get questions answered. And have friendly open-ended discussions and chat (Slack/StackOverflow/Discourse/Reddit/Disqus hybrid). ([Demo](https://www.talkyard.io/forum/latest), [Source Code](https://github.com/debiki/talkyard)) `AGPL-3.0` `Scala`
 - [Telescope](http://www.telescopeapp.org/) - Open-source social news app built with Meteor. ([Demo](http://demo.telescopeapp.org/), [Source Code](https://github.com/TelescopeJS/Telescope)) `MIT` `Nodejs`
 - [Tokumei](https://tokumei.co/) - Anonymous microblogging platform. ([Demo](https://demo.tokumei.co/), [Source Code](https://kfarwell.org/projects/tokumei/git/)) `ISC` `rc`
 - [twister](http://twister.net.co/) - Fully decentralized P2P microblogging platform leveraging the free software implementations of Bitcoin and BitTorrent protocols. ([Source Code](https://github.com/miguelfreitas/twister-core)) `MIT` `C++`
@ -460,7 +465,6 @@ _[Extensible Messaging and Presence Protocol](https://en.wikipedia.org/wiki/XMPP
 - [Converse.js](https://conversejs.org/) - Free and open-source XMPP chat client in your browser. ([Source Code](https://github.com/jcbrand/converse.js)) `MPL-2.0` `Javascript`
 - [JSXC](https://jsxc.org) - Real-time XMPP web chat application with video calls, file transfer and encrypted communication. There are also versions for Nextcloud/Owncloud and SOGo. ([Source Code](https://github.com/jsxc/jsxc)) `MIT` `Javascript`
 - [Kaiwa](http://getkaiwa.com/) - Web based chat client in the style of common paid alternatives. ([Source Code](https://github.com/digicoop/kaiwa)) `MIT` `Nodejs`
 - [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`
 - [Salut à Toi](http://www.salut-a-toi.org/) - Multipurpose, multi frontend, libre and decentralised communication tool. ([Source Code](http://repos.goffi.org/sat)) `AGPL-3.0` `Python`
  - [Libervia](http://wiki.goffi.org/wiki/Libervia/en) - Web frontend from Salut à Toi. ([Source Code](http://repos.goffi.org/libervia)) `AGPL-3.0` `Python`
@ -580,7 +584,6 @@ _Personal e-book management software._
  - [BicBucStriim](http://projekte.textmulch.de/bicbucstriim/) - Provides web-based access to your Calibre Library's e-book collection. ([Source Code](https://github.com/rvolz/BicBucStriim)) `MIT` `PHP`
  - [Calibre Web](https://github.com/janeczku/calibre-web) - Web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. ([Source Code](https://github.com/janeczku/calibre-web)) `GPL-3.0` `Python`
  - [COPS](https://blog.slucas.fr/en/oss/calibre-opds-php-server) - Lightweight e-book server alternative to Calibre content server or [Calibre2OPDS](https://calibre2opds.com/2011/11/03/new-site-for-calibre2opds/). ([Demo](http://cops-demo.slucas.fr/index.php), [Source Code](https://github.com/seblucas/cops)) `GPL-2.0` `PHP`
 - [LibreRead](https://libreread.org/) - Self-hosted Web-based e-book reader. ([Demo](https://demo.libreread.org/), [Source Code](https://github.com/LibreRead/server)) `AGPL-3.0` `Go`
 _Enterprise-class library management software._
@ -620,7 +623,6 @@ See https://github.com/n1trux/awesome-sysadmin#identity-management
 **[`^        back to top        ^`](#)**
 - [CommaFeed](https://www.commafeed.com/) - Google Reader inspired self-hosted RSS reader. ([Source Code](https://github.com/Athou/commafeed)) `Apache-2.0` `Java`
 - [Creaky Coot](http://bugs.derivoile.fr/Creaky-Coot/dashboard) - Minimalist and responsive RSS reader and links saver. ([Source Code](https://github.com/piero-la-lune/Creaky-Coot)) `MIT` `PHP`
 - [Feedbin](https://feedbin.com/) - Simple, fast and nice looking RSS reader. ([Source Code](https://github.com/feedbin/feedbin)) `MIT` `Ruby`
 - [FeedHQ](https://feedhq.org/) - FeedHQ is a web-based feed reader. ([Source Code](https://github.com/feedhq/feedhq)) `BSD-3-Clause` `Python`
 - [FreshRSS](http://freshrss.org/) - Self-hostable RSS feed aggregator. ([Demo](http://demo.freshrss.org/i/), [Source Code](https://github.com/FreshRSS/FreshRSS), [Mobile app](https://github.com/Alkarex/EasyRSS)) `AGPL-3.0` `PHP`
@ -628,10 +630,9 @@ See https://github.com/n1trux/awesome-sysadmin#identity-management
 - [Kriss Feed](http://tontof.net/kriss/feed/) - Simple and smart (or stupid) feed reader. ([Demo](http://tontof.net/feed/), [Source Code](https://github.com/tontof/kriss_feed/)) `CC0-1.0` `PHP`
 - [Leed](http://leed.idleman.fr) - Leed (for Light Feed) is a Free and minimalist RSS aggregator. ([Source Code](https://github.com/ldleman/Leed)) `AGPL-3.0` `PHP`
 - [Leselys](https://github.com/socketubs/leselys) - Your very elegant RSS reader. `AGPL-3.0` `Python`
- [Lite-Reader](http://cubny.com/lite-reader/) - Read your feeds on your own machine with a simple and lite application. ([Source Code](https://github.com/cubny/lite-reader)) `BSD-3-Clause` `PHP`
+- [Lite-Reader](https://github.com/cubny/lite-reader) - Read your feeds on your own machine with a simple and lite application. ([Demo](http://cubny.com/lite-reader/)) `BSD-3-Clause` `PHP`
 - [Moonmoon](http://moonmoon.org/) - simple feed agregator (planet like): it only aggregates feeds and spits them out in one single page. ([Source Code](https://github.com/mauricesvay/moonmoon)) `BSD` `PHP`
 - [Miniflux](https://miniflux.net/) - Miniflux 2 is a minimalist and open source news reader, written in Go and PostgreSQL. ([Source Code](https://github.com/miniflux/miniflux)) `Apache-2.0` `Go`
 - [RSSPBRRY](http://jasoncomely.com/rss-tastemaker/) - Fresh new RSS feed reader. ([Source Code](https://github.com/rsspbrry/rsspbrry)) `AGPL-3.0` `PHP`
 - [NewsBlur](http://www.newsblur.com/) - NewsBlur is a personal news reader that brings people together to talk about the world. A new sound of an old instrument. ([Source Code](https://github.com/samuelclay/NewsBlur)) `MIT` `Python`
 - [Nunux Reader](http://reader.nunux.org/) - Simple, fast and reactive RSS reader. ([Source Code](https://github.com/ncarlier/nunux-reader)) `GPL-3.0` `Nodejs`
 - [Reader-Self](http://readerself.com/) - Self-hosted rss reader (php / mysql or sqlite) - Google Reader alternative. ([Source Code](https://github.com/readerself/readerself)) `GPL-3.0` `PHP`
@ -639,14 +640,14 @@ See https://github.com/n1trux/awesome-sysadmin#identity-management
 - [RSS Monster](https://github.com/pietheinstrengholt/rssmonster) - RSS Monster is an easy to use web-based RSS aggregator and reader compatible with the Fever API, created as an alternative for Google Reader. `MIT` `PHP`
 - [Screaming Liquid Tiger](https://github.com/herrbischoff/screaming-liquid-tiger) - Simple script to automatically generate valid RSS and Atom feeds from a list of media files in the same folder. `MIT` `PHP`
 - [Selfoss](http://selfoss.aditu.de/) - New multipurpose rss reader, live stream, mashup, aggregation web application. ([Source Code](https://github.com/SSilence/selfoss)) `AGPL-3.0` `PHP`
- [Sismics Reader](https://github.com/sismics/reader) - Free and open source feeds reader, including all major Google Reader features. `GPL-2.0` `Java`
+- [Sismics Reader](http://sismics.com/reader/) - Free and open source feeds reader, including all major Google Reader features. ([Demo](https://www.sismics.com/reader/#!/demo), [Source Code](https://github.com/sismics/reader)) `GPL-2.0` `Java`
 - [Stringer](https://github.com/swanson/stringer) - Work-in-progress self-hosted, anti-social RSS reader. `MIT` `Ruby`
 - [Temboz](https://github.com/fazalmajid/temboz) - Two-column feed reader emphasizing filtering capabilities to manage information overload. `MIT` `Python`
 - [Tiny Tiny RSS](https://tt-rss.org/gitlab/fox/tt-rss) - Open source web-based news feed (RSS/Atom) reader and aggregator. ([Demo](http://framanews.org/)) `GPL-3.0` `PHP`
  - [gritttt-rss](http://gritttt-rss.nicolashoening.de/) - More features for Tiny Tiny RSS. ([Source Code](https://github.com/nhoening/gritttt-rss)) `BSD-2-Clause` `Python`
  - [ttrss-mobile](https://github.com/mboinet/ttrss-mobile) - Mobile webapp for Tiny Tiny RSS. `AGPL-3.0` `Javascript`
  - [ttrss-reader](https://github.com/kucrut/ttrss-reader) - Light and responsive client for TTRSS. `GPL-2.0` `Javascript`
- [Winds](https://github.com/GetStream/Winds) `⚠` - Open source and beautiful RSS reader built using React/Redux/Sails/Node and Stream. It showcases personalized feeds powered by the Stream API. ([Demo](https://winds.getstream.io/)) `BSD-3-Clause` `Nodejs`
+- [Winds](https://getstream.io/winds/) `⚠` - Open source and beautiful RSS reader built using React/Redux/Sails/Node and Stream. It showcases personalized feeds powered by the Stream API. ([Demo](https://winds.getstream.io/), [Source Code](https://github.com/GetStream/Winds)) `BSD-3-Clause` `Nodejs`
 ## File Sharing and Synchronization
@ -666,7 +667,7 @@ See https://github.com/n1trux/awesome-sysadmin#distributed-filesystems
 - [Kinto](https://kinto.readthedocs.org) - Kinto is a minimalist JSON storage service with synchronisation and sharing abilities. ([Source Code](https://github.com/Kinto)) `Apache-2.0` `Python`
 - [Nextcloud](https://nextcloud.com/) - Access and share your files, calendars, contacts, mail and [more](https://apps.nextcloud.com/) from any device, on your terms. ([Demo](https://demo.nextcloud.com/), [Source Code](https://github.com/nextcloud/server)) `AGPL-3.0` `PHP`
 - [OpenSSH/SFTP](http://www.openssh.com/) - Secure File Transfer Program. ([Source Code](http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh)) `BSD` `C`
- [ownCloud](https://owncloud.org/) - All-in-one solution for saving, synchronizing, viewing, editing and sharing files, calendars, address books and more. ([Source Code](https://github.com/owncloud/core)) `AGPL-3.0` `PHP`
+- [ownCloud](https://owncloud.org/) - All-in-one solution for saving, synchronizing, viewing, editing and sharing files, calendars, address books and more. ([Source Code](https://github.com/owncloud/core), [Clients](https://github.com/owncloud/core/wiki/Apps)) `AGPL-3.0` `PHP`
 - [Pydio](https://pydio.com/) - Turn any web server into a powerful file management system and an alternative to mainstream cloud storage providers. ([Source Code](https://github.com/pydio/pydio-core)) `AGPL-3.0` `PHP`
 - [Samba](https://www.samba.org/) - Samba is the standard Windows interoperability suite of programs for Linux and Unix. It provides secure, stable and fast file and print services for all clients using the SMB/CIFS protocol. ([Source Code](https://git.samba.org/samba.git/)) `GPL-3.0` `C`
 - [Seafile](https://www.seafile.com/en/home/) - File hosting and sharing solution primary for teams and organizations. ([Demo](https://seacloud.cc/demo), [Source Code](https://github.com/haiwen/seafile)) `GPL-2.0` `C`
@ -739,7 +740,6 @@ _Command-line file upload_
 - [goBrowser](https://github.com/xataz/gobrowser) - Simple http file browser. ([Source Code](https://github.com/xataz/gobrowser)) `GPL-3.0` `Go`
 - [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`
 - [Monsta FTP](http://www.monstaftp.com/) - Open source PHP/Ajax cloudware that puts FTP file management right in your browser, anywhere, any time. ([Demo](http://mftp.live/), [Source Code](https://github.com/MonstaApps/Monsta-FTP)) `GPL-3.0` `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`
 - [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`
@ -849,14 +849,17 @@ See also <https://en.wikipedia.org/wiki/List_of_streaming_media_systems>, <https
 - [Darwin Streaming Server](https://macosforge.github.io/dss/) - High performance server for streaming QuickTime and MPEG-4 media over RTP and RTSP protocols. Originated as Apple’s QTSS. ([Source Code](https://github.com/macosforge/dss)) `APSL-2.0` `C++`
 - [Flumotion](http://flumotion.net/) - Streaming media server with intuitive graphical administration tools. ([Source Code](https://github.com/Flumotion/flumotion)) `LGPL-2.1` `Python`
 - [homehost](https://github.com/ridhwaans/homehost) `⚠` - Self-hosted React + Redux app that streams your media collection (music, movies, books, podcasts, comics etc). `MIT` `Nodejs`
 - [Icecast 2](http://www.icecast.org/) - streaming audio/video server which can be used to create an Internet radio station or a privately running jukebox and many things in between. ([Source Code](https://git.xiph.org/?p=icecast-server.git;a=summary), [Clients](http://www.icecast.org/apps/)) `GPL-2.0` `C`
 - [MistServer](http://mistserver.org/) - Streaming media server that works well in any streaming environment. ([Source Code](https://github.com/DDVTECH/mistserver)) `AGPL-3.0` `C++`
 - [ReadyMedia](http://sourceforge.net/projects/minidlna/) - Simple media server software, with the aim of being fully compliant with DLNA/UPnP-AV clients. `GPL-2.0` `C`
 - [Rygel](https://wiki.gnome.org/action/show/Projects/Rygel) - Rygel is a UPnP AV MediaServer that allows you to easily share audio, video, and pictures. Media player software may use Rygel to become a MediaRenderer that may be controlled remotely by a UPnP or DLNA Controller. `GPL-3.0` `C`
 - [üWave](http://u-wave.net/) `⚠` - üWave is a self-hosted collaborative listening platform. Users take turns playing media—songs, talks, gameplay videos, or anything else—from a variety of media sources like YouTube and SoundCloud. ([Demo](https://wlk.yt/), [Source Code](https://github.com/u-wave)) `MIT` `Nodejs`
 ### Audio Streaming
 - [Ampache](http://ampache.org/) - Web based audio/video streaming application. ([Demo](http://play.dogmazic.net/), [Source Code](https://github.com/ampache/ampache)) `AGPL-3.0` `PHP`
- [Beets](http://beets.io/) - Music library manager and MusicBrainz tagger (command-line and Web interface). ([Source code](https://github.com/beetbox/beets)) `MIT` `Python`
+- [Beets](http://beets.io/) - Music library manager and MusicBrainz tagger (command-line and Web interface). ([Source Code](https://github.com/beetbox/beets)) `MIT` `Python`
 - [CherryMusic](http://www.fomori.org/cherrymusic/) - Minimalistic Web-Mediaplayer. ([Source Code](https://github.com/devsnd/cherrymusic)) `GPL-3.0` `Python`
 - [cloudtunes](https://github.com/jkbrzt/cloudtunes) `⚠` - Web-based music player for the cloud. `MIT` `Python`
 - [Compactd](https://github.com/compactd/compactd) - Remote music player that supports adding content. `MIT` `Nodejs`
@ -877,7 +880,7 @@ See also <https://en.wikipedia.org/wiki/List_of_streaming_media_systems>, <https
  - [ympd](http://www.ympd.org/) - Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS. ([Source Code](https://github.com/notandy/ympd)) `GPL-2.0` `C`
 - [mStream](http://mstream.io/) - Music streaming server with GUI management tools. Runs on Mac, Windows, and Linux. ([Demo](https://darncoyotes.mstream.io/), [Source Code](https://github.com/IrosTheBeggar/mStream)) `GPL-2.0` `Nodejs`
 - [Music Browser](https://github.com/henrik242/musicbrowser) - Browser and streamer for your music collection. It is runs on most operating systems, and is light enough to run flawlessly on NAS devices. `GPL-3.0` `PHP`
- [musikcube](https://musikcube.com/) - Streaming audio server with Linux/macOS/Windows/Android clients. ([Source code](https://github.com/clangen/musikcube)) `BSD-3-Clause` `C++`
+- [musikcube](https://musikcube.com/) - Streaming audio server with Linux/macOS/Windows/Android clients. ([Source Code](https://github.com/clangen/musikcube)) `BSD-3-Clause` `C++`
 - [Sonerezh](https://www.sonerezh.bzh/) - Self-hosted, web-based application for stream your music, everywhere. ([Demo](https://www.sonerezh.bzh/demo/), [Source Code](https://github.com/sonerezh/sonerezh)) `GPL-3.0` `PHP`
 ### Video Streaming
@ -886,14 +889,14 @@ See also <https://en.wikipedia.org/wiki/List_of_streaming_media_systems>, <https
 - [CyTube](https://github.com/calzoneman/sync) - CyTube is a web application providing media synchronization, chat, and more for an arbitrary number of channels. ([Demo](http://cytu.be)) `MIT` `Nodejs`
 - [Emby](https://emby.media/) - Home media server supporting both DLNA and DIAL (Chromecast) devices out-of-the-box. ([Source Code](https://github.com/MediaBrowser/Emby)) `GPL-2.0` `C#`
 - [Hellowlol HTPC Manager fork](https://github.com/Hellowlol/HTPC-Manager) - Fully responsive interface to manage all your favorite media on your HTPC. ([Source Code](https://github.com/styxit/HTPC-Manager)) `MIT` `Python`
- [Icecast 2](http://www.icecast.org/) - streaming audio/video server which can be used to create an Internet radio station or a privately running jukebox and many things in between. ([Source Code](https://git.xiph.org/?p=icecast-server.git;a=summary)) `GPL-2.0` `C`
+- [Icecast 2](http://www.icecast.org/) - streaming audio/video server which can be used to create an Internet radio station or a privately running jukebox and many things in between. ([Source Code](https://git.xiph.org/?p=icecast-server.git;a=summary), [Clients](https://www.icecast.org/apps/)) `GPL-2.0` `C`
 - [MistServer](http://mistserver.org/) - Streaming media server that works well in any streaming environment. ([Source Code](https://github.com/DDVTECH/mistserver)) `AGPL-3.0` `C++`
 - [Myflix](https://github.com/pastapojken/Myflix) - Self-hosted, super lightweight Netflix alternative. `MIT` `Shell`
 - [Odd Networks](http://oddnetworks.com) - Open source video management system (VMS) and API for collections and videos with supporting SDKs for Roku, Apple iOS/tvOS, Google Android, and Amazon FireTV. ([Source Code](https://github.com/oddnetworks/oddworks)) `MIT` `Nodejs`
 - [PeerTube](https://framagit.org/chocobozzz/PeerTube) - Decentralized video streaming platform using P2P (BitTorrent) directly in the web browser. `AGPL-3.0` `Nodejs`
 - [Restreamer](https://datarhei.github.io/restreamer/) - Restreamer allows you to do h.264 real-time video streaming on your website without a streaming provider. ([Source Code](https://github.com/datarhei/restreamer)) `Apache-2.0` `Nodejs/Docker`
 - [Shinobi](https://moeiscool.github.io/Shinobi/) - Open Source CCTV software written in Node with both IP and local camera support. ([Source Code](https://github.com/moeiscool/Shinobi)) `GPL-2.0` `Nodejs`
 - [Streama](https://github.com/dularion/streama) - Self-hosted Netflix alternative. `MIT` `Java`
 - [üWave](http://u-wave.net/) `⚠` - üWave is a self-hosted collaborative listening platform. Users take turns playing media—songs, talks, gameplay videos, or anything else—from a variety of media sources like YouTube and SoundCloud. ([Demo](https://wlk.yt/), [Source Code](https://github.com/u-wave)) `MIT` `Nodejs`
 - [VideoLAN Client (VLC)](https://www.videolan.org/) - Cross-platform multimedia player client and server supporting most multimedia files as well as DVDs, Audio CDs, VCDs, and various streaming protocols. ([Source Code](https://github.com/videolan/vlc)) `Multiple` `C`
 - [Zoneminder](https://github.com/ZoneMinder/ZoneMinder) - Closed-circuit television (CCTV) software application which supports IP, USB and Analog cameras. `GPL-2.0` `PHP`
@ -917,6 +920,7 @@ See also <https://en.wikipedia.org/wiki/List_of_streaming_media_systems>, <https
 - [King Phisher](https://github.com/securestate/king-phisher) - King Phisher is a tool for testing and promoting user awareness by simulating real world phishing attacks. `BSD` `Python`
 - [LibreNews](https://librenews.io/) - Decentralized and secure breaking news notification system. ([Source Code](https://github.com/milesmcc/LibreNews-Server/)) `GPL-3.0` `Python`
 - [LicAPI](https://projects.miguelpiedrafita.com/LicAPI) - PHP API to manage license info. ([Source Code](https://github.com/m1guelpf/LicAPI)) `MPL-2.0` `PHP`
 - [Maily Form](https://github.com/jlelse/Maily-Form) - Self-hosted service you can use to place forms on static sites. It uses nodemailer and you can host it with Docker. `GPL-3.0` `Nodejs/Docker`
 - [Mindmaps](https://github.com/drichard/mindmaps) - Open source, offline capable, mind mapping application. ([Demo](http://drichard.org/mindmaps/)) `AGPL-3.0` `HTML5`
 - [Monica](https://monicahq.com/) - Personal relationship manager, and a new kind of CRM to organize interactions with your friends and family. ([Source Code](https://github.com/monicahq/monica)) `AGPL-3.0` `PHP`
 - [Musical Artifacts](https://musical-artifacts.com/) - Helping to catalog, preserve and free the artifacts you need to produce music. ([Source Code](https://github.com/lfzawacki/musical-artifacts)) `MIT` `Ruby`
@ -932,7 +936,7 @@ See also <https://en.wikipedia.org/wiki/List_of_streaming_media_systems>, <https
 - [Ulterius](https://ulterius.io) - Ulterius is an open-source remote desktop software with lots of awesome functions. ([Demo](https://ulterius.io/signup/), [Source Code](https://github.com/Ulterius/server)) `MPL-2.0` `C#`
 - [ViMbAdmin](http://www.vimbadmin.net/) - Provides a web based virtual mailbox administration system to allow mail administrators to easily manage domains, mailboxes and aliases. ([Demo](http://www.vimbadmin.net/demo/auth/login), [Source Code](https://github.com/opensolutions/ViMbAdmin)) `GPL-3.0` `PHP`
 - [visualCaptcha](http://visualcaptcha.net/) - Configurable captcha solution, focusing on accessibility and simplicity whilst maintaining security. ([Demo](http://demo.visualcaptcha.net/), [Source Code](https://github.com/emotionLoop/visualCaptcha)) `MIT` `PHP/Nodejs/Ruby/Python`
- [Web fonts repository](https://github.com/Finesse/web-fonts-repository) — A simple webfont hosting. Google Fonts alternative for your own fonts. `MIT` `PHP`
+- [Web fonts repository](https://github.com/Finesse/web-fonts-repository) - A simple webfont hosting. Google Fonts alternative for your own fonts. `MIT` `PHP`
 - [webtrees](https://www.webtrees.net) - Webtrees is the web's leading on-line collaborative genealogy application. ([Demo](https://dev.webtrees.net/demo-stable/index.php?ctype=gedcom&ged=demo), [Source Code](https://github.com/fisharebest/webtrees)) `GPL-3.0` `PHP`
 ## Money, Budgeting and Management
@ -945,7 +949,7 @@ See also https://github.com/n1trux/awesome-sysadmin#it-asset-management
 - [Benedetto](https://github.com/arecker/bennedetto) - Bennedetto is a simple, turn-based budget management app. `GPL-3.0` `Python`
 - [Budget App](https://www.budgetapp.io/) - Budget App is an open source personal budgeting application. ([Demo](https://demo.budgetapp.io/), [Source Code](https://github.com/paukiatwee/budgetapp)) `Apache-2.0` `Java`
 - [Dot Ledger](https://www.dotledger.com/) - Web-based personal finance management tool. ([Demo](https://demo.dotledger.com/), [Source Code](https://github.com/dotledger/dotledger)) `Apache-2.0` `Ruby`
- [Economizzer](http://www.economizzer.org/) - Economizzer is a simple and open source personal finance manager system, available in English, Portuguese (PT|BR) and Russian. ([Source Code](https://github.com/gugoan/economizzer)) `MIT` `PHP`
+- [Economizzer](http://www.economizzer.org/) - An easy and secure system for you to manage your personal money and achieve your goals, and can be accessed by computer, tablet or smartphone. ([Demo](https://github.com/gugoan/economizzer#live-demo), [Source Code](https://github.com/gugoan/economizzer)) `MIT` `PHP`
 - [ExMoney](https://github.com/gaynetdinov/ex_money) - Self-hosted personal finance app. `ISC` `Elixir`
 - [Firefly III](https://firefly-iii.org/) - Firefly III is a modern financial manager. It helps you to keep track of your money and make budget forecasts. It supports credit cards, shared household accounts, and savings accounts. It's powered by Laravel and requires PHP7.1. ([Demo](https://demo.firefly-iii.org/), [Source Code](https://github.com/firefly-iii/firefly-iii)) `GPL-3.0` `PHP`
 - [Galette](http://galette.eu/dc/) - Galette is a membership management web application towards non profit organizations. ([Source Code](http://git.tuxfamily.org/galette/galette.git/)) `GPL-3.0` `PHP`
@ -954,7 +958,7 @@ See also https://github.com/n1trux/awesome-sysadmin#it-asset-management
 - [Inventaire](https://inventaire.io/welcome) - Collaborative resources mapper project, while yet only focused on exploring books mapping with wikidata and ISBNs. ([Source Code](https://github.com/inventaire/inventaire)) `AGPL-3.0` `Nodejs`
 - [Invoice Ninja](https://www.invoiceninja.org/) - Powerful tool to invoice clients online. ([Demo](https://app.invoiceninja.com/invoices/create), [Source Code](https://github.com/invoiceninja/invoiceninja)) `AAL` `PHP`
 - [InvoicePlane](https://invoiceplane.com/) - Manage quotes, invoices, payments and customers for your small business. ([Demo](https://demo.invoiceplane.com), [Source Code](https://github.com/InvoicePlane/InvoicePlane)) `MIT` `PHP`
- [IHateMoney](http://ihatemoney.org/) - Manage your shared expenses, easily. ([Source Code](https://github.com/spiral-project/ihatemoney)) `BSD` `Python`
+- [IHateMoney](http://ihatemoney.org/) - Manage your shared expenses, easily. ([Demo](https://ihatemoney.org/demo/), [Source Code](https://github.com/spiral-project/ihatemoney)) `BSD` `Python`
 - [PartKeepr](https://www.partkeepr.org) - PartKeepr is an electronic part inventory management software. It helps you to keep track of your available parts and assist you with re-ordering parts. ([Demo](https://demo.partkeepr.org/), [Source Code](https://github.com/partkeepr/PartKeepr)) `GPL-3.0` `PHP`
 - [SilverStrike](https://silverstrike.tk/) - Personal finance management made easy. ([Demo](https://demo.silverstrike.tk/), [Source Code](https://github.com/agstrike/silverstrike)) `MIT` `Python/Django`
 - [StockazNG](https://dev.sigpipe.me/dashie/StockazNG) - Asset Management System. `MIT` `Python`
@ -971,7 +975,7 @@ See https://github.com/n1trux/awesome-sysadmin#monitoring and https://github.com
 *See also [Wikis](#wikis)*
- [BulletNotes](https://bulletnotes.io/) - Workflowy / Dynalist clone with Kanban (Trello) and Calendar functionality. Organize everything. ([Source Code](https://github.com/NickBusey/BulletNotes)) `MIT` `Nodejs`
+- [BulletNotes](https://bulletnotes.io/) - Workflowy / Dynalist clone with Kanban (Trello) and Calendar functionality. Organize everything. ([Source Code](https://gitlab.com/NickBusey/BulletNotes)) `MIT` `Nodejs`
 - [Boostnote](https://boostnote.io/) - The note-taking app for programmers that focuses on markdown, snippets, and customizability. ([Source Code](https://github.com/BoostIO/Boostnote/)) `GPL-3.0` `JavaScript`
 - [dillinger](http://dillinger.io/) - The last Markdown editor, ever. ([Source Code](https://github.com/joemccann/dillinger/)) `MIT` `Nodejs`
 - [draw.io](https://draw.io) - Diagram software for making flowcharts, process diagrams, org charts, UML, ER and network diagrams. ([Source Code](https://github.com/jgraph/drawio)) `Apache-2.0` `JavaScript`
@ -1000,8 +1004,8 @@ See https://github.com/n1trux/awesome-sysadmin#monitoring and https://github.com
 - [EtherDraw](https://github.com/JohnMcLear/draw) - Intuitive collaborative drawing web based tool. `Apache-2.0` `Nodejs`
 - [Etherpad](http://etherpad.org/) - Etherpad is a highly customizable Open Source online editor providing collaborative editing in really real-time. ([Demo](https://demo.sandstorm.io/appdemo/h37dm17aa89yrd8zuqpdn36p6zntumtv08fjpu8a8zrte7q1cn60), [Source Code](https://github.com/ether/etherpad-lite)) `Apache-2.0` `Nodejs`
 - [Infinoted](https://github.com/gobby/gobby/wiki/Dedicated%20Server) - Server for [Gobby](https://github.com/gobby/gobby/wiki), a multi-platform collaborative text editor. ([Source Code](https://github.com/gobby/gobby)) `MIT` `C++`
- [ONLYOFFICE](http://onlyoffice.org/) - Office suite that enables you to manage documents, projects, team and customer relations in one place. ([Source Code](https://github.com/ONLYOFFICE/DocumentServer)) `AGPL-3.0` `Nodejs`
+- [ONLYOFFICE](https://helpcenter.onlyoffice.com/faq/server-opensource.aspx) - Office suite that enables you to manage documents, projects, team and customer relations in one place. ([Source Code](https://github.com/ONLYOFFICE/DocumentServer)) `AGPL-3.0` `Nodejs`
- [PHPOffice](http://phpoffice.github.io/) - PHPOffice contains libraries which permits to write and read files from most office suites. `LGPL-3.0` `PHP`
+- [PHPOffice](https://github.com/PHPOffice) - PHPOffice contains libraries which permits to write and read files from most office suites. `LGPL-3.0` `PHP`
 - [WebODF](http://webodf.org/) - Tools and libraries to view and edit Open Document Format (ODF) files. ([Source Code](https://github.com/kogmbh/WebODF)) `AGPL-3.0` `HTML5`
 ## Password Managers
@ -1022,24 +1026,24 @@ See https://github.com/n1trux/awesome-sysadmin#monitoring and https://github.com
 - [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)) `BSD` `Ruby`
 - [CryptPad](https://cryptpad.fr/) - CryptPad is the zero knowledge realtime collaborative editor. ([Source Code](https://github.com/xwiki-labs/cryptpad)) `AGPL-3.0` `Nodejs`
- [EdPaste](https://github.com/Edraens/EdPaste) - Self-hosted pastebin written in Laravel (PHP Framework). `MIT` `PHP`
+- [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`
- [gist](https://gitnet.fr/deblan/gist) - GIST is an open-source application to share code. `GPL-3.0` `PHP`
+- [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`
 - [localpaste](https://github.com/petermaloney/localpaste) - Simple python based pastebin you can run locally, with curl for input. Supports RAW text by default and binary data such as images (no extensions on returned url). `GPL-2.0` `Python`
 - [Modern Paste](https://www.modernpaste.com) - Modern pastebin with a contemporary, minimalistic user interface backed by a robust feature set. ([Demo](https://demo.modernpaste.com/), [Source Code](https://github.com/LINKIWI/modern-paste)) `MIT` `Python`
 - [mojopaste](http://search.cpan.org/dist/App-mojopaste/) - Perl based pastebin. ([Demo](http://p.thorsen.pm/), [Source Code](https://github.com/jhthorsen/app-mojopaste)) `Artistic-2.0` `Perl`
 - [NoteHub](https://notehub.org) - Free and Hassle-free Pastebin for Markdown Pages. Simple, clean, password provided, generated-short link. ([Demo](https://notehub.org), [Source Code](https://github.com/chmllr/NoteHub)) `MIT` `Nodejs`
- [Paste](http://phpaste.sourceforge.io/) - Paste is forked from the original source pastebin.com used before it was bought. ([Demo](http://phpaste.sourceforge.net/demo), [Source Code](https://github.com/jordansamuel/PASTE)) `GPL-3.0` `PHP`
+- [Paste](https://phpaste.sourceforge.io/) - Paste is forked from the original source pastebin.com used before it was bought. ([Demo](https://phpaste.sourceforge.io/demo/), [Source Code](https://github.com/jordansamuel/PASTE)) `GPL-3.0` `PHP`
 - [pastebin](https://github.com/prologic/pastebin) - Simple pastebin service with convenient api and CLI. ([Demo](https://paste.mills.io)) `MIT` `Go`
 - [Pastebin](https://github.com/ewhal/Pastebin) - Modern self-hosted pastebin service with a restful API. `MIT` `Go`
 - [pb](https://github.com/ptpb/pb) - Lightweight pastebin (and url shortener) built using flask. ([Demo](https://ptpb.pw/)) `GPL-3.0` `Python`
 - [pbnh](https://github.com/bhanderson/pbnh) - Pastebin inspired from project pb and hastebin, with an API and a SQL-based backend. `MIT` `Python`
 - [Phaste](https://pste.pw) - Phalcon-based, MySQL pastebin application with privacy-respecting Piwik integration and syntax highlighting. ([Source Code](https://github.com/FoxDev/Phaste)) `AGPL-3.0` `PHP`
 - [PrivateBin](https://privatebin.info/) - PrivateBin is a minimalist, opensource online pastebin/discussion board where the server has zero knowledge of hosted data. ([Demo](https://privatebin.net/), [Source Code](https://github.com/PrivateBin/PrivateBin)) `Zlib` `PHP`
- [SharpPaste](https://github.com/phonicmouse/SharpPaste) - Cross-platform C# pastebin with client-side AES-256 encryption that just works. ([Demo](https://sharppaste.nl/)) `MIT` `C#/ASP.NET`
+- [SharpPaste](https://github.com/phonicmouse/SharpPaste) - Cross-platform C# pastebin with client-side AES-256 encryption that just works. ([Demo](https://sharppaste.nl/)) `MIT` `C#/NancyFX`
 - [Snibox](https://snibox.github.io/) - Code snippets manager with attractive tag-oriented interface. ([Demo](https://snibox-demo.herokuapp.com/), [Source Code](https://github.com/snibox/snibox)) `MIT` `Ruby`
 - [snipt](https://snipt.net/) - Long-term memory for coders. Share and store code snippets. ([Source Code](https://github.com/nicksergeant/snipt/)) `BSD` `Python`
- [Stikked](https://github.com/claudehohl/Stikked) - Advanced and beautiful pastebin. `GPL-3.0` `PHP`
+- [Stikked](https://github.com/claudehohl/Stikked) - Advanced and beautiful pastebin. ([Demo](https://paste.scratchbook.ch/)) `GPL-3.0` `PHP`
 - [Sup3rS3cretMes5age](https://github.com/algolia/sup3rS3cretMes5age) - Very simple (to deploy and to use) secret message service using Hashicorp Vault as a secrets storage. `MIT` `Go`
 - [tastebin](https://github.com/andreineculau/tastebin) - Updated version of hastebin plus additional features. `Apache-2.0` `Nodejs`
@ -1054,8 +1058,9 @@ See https://github.com/n1trux/awesome-sysadmin#metric--metric-collection
 - [Dj Diabetes](https://github.com/foxmask/dj-diabetes) - My Glucose Manager - follow your daily health. `BSD` `Python`
 - [Habitica](https://habitica.com/) - Habit tracker app which treats your goals like a Role Playing Game. Previously called HabitRPG. ([Source Code](https://github.com/HabitRPG/habitrpg)) `GPL-3.0/CC-BY-NC-SA-3.0/CC-BY-SA-3.0` `Nodejs`
 - [Homepage](https://github.com/thetomester13/homepage) - Simple, standalone, self-hosted PHP page that is your window to your server and the web. `MIT` `PHP`
 - [iDashboard-PHP](https://github.com/causefx/iDashboard-PHP) - HTPC Dashboard to load website services. `MIT` `PHP`
 - [Iotdashboard](http://iotdashboard.pythonanywhere.com/en/) - Fast Django server for IOT Devices. ([Source Code](https://github.com/electrocoder/iotdashboard)) `Apache-2.0` `JavaScript`
- [simple-dash](https://github.com/Swagielka/simple-dash) - A simple, fully responsive Dashboard to forward to the services of your choice! `MIT` `PHP`
+- [simple-dash](https://github.com/Swagielka/simple-dash) - A simple, fully responsive Dashboard to forward to the services of your choice. `MIT` `PHP`
 - [Thingsboard](https://thingsboard.io/) - Open-source IoT Platform - Device management, data collection, processing and visualization. ([Demo](https://demo.thingsboard.io/signup), [Source Code](https://github.com/thingsboard/thingsboard)) `Apache-2.0` `Java`
 - [Thingspeak](https://thingspeak.com/) - Open source “Internet of Things” application and API to store and retrieve data from things using HTTP. ([Demo](https://thingspeak.com/channels/public), [Source Code](https://github.com/iobridge/thingspeak)) `GPL-3.0` `Ruby`
 - [Tipboard](http://allegro.tech/tipboard/) - In-house, tasty, local dashboarding system. ([Source Code](https://github.com/allegro/tipboard)) `Apache-2.0` `Python`
@ -1090,7 +1095,7 @@ See https://github.com/n1trux/awesome-sysadmin#metric--metric-collection
 - [Calagator](http://calagator.org/) - Event aggregator. ([Demo](http://calagator.org/), [Source code](https://github.com/calagator/calagator)) `MIT` `Ruby`
 - [Clerk](https://github.com/chr15m/Clerk) - Simple event logger to keep track of periodic events, habits, etc. as they occur. `GPL-3.0` `PHP`
- [dudle](http://primelife.ercim.eu/results/opensource/63-dudle) - Online scheduling application. ([Demo](https://dudle.inf.tu-dresden.de/)) `AGPL-3.0` `Ruby`
+- [dudle](http://primelife.ercim.eu/results/opensource/63-dudle) - Online scheduling application. ([Demo](https://dudle.inf.tu-dresden.de/), [Source code](https://github.com/kellerben/dudle)) `AGPL-3.0` `Ruby`
 - [Fider](http://getfider.com) - Open source alternative to UserVoice for customer feedback. ([Demo](https://demo.fider.io), [Source Code](https://github.com/getfider/fider)) `MIT` `Go`
 - [Framadate](https://framadate.org/) - Online service for planning an appointment or make a decision quickly and easily: Make a poll, Define dates or subjects to choose, Send the poll link to your friends or colleagues, Discuss and make a decision. ([Demo](https://framadate.org/aqg259dth55iuhwm), [Source Code](https://git.framasoft.org/framasoft/framadate)) `CECILL-B` `PHP`
 - [Kyélà](http://kyela.net/) - Participation polls for group events. ([Demo](http://kyela.net/55232734237c8/), [Source Code](https://github.com/abienvenu/Kyela)) `AGPL-3.0` `PHP`
@ -1129,7 +1134,7 @@ See https://github.com/n1trux/awesome-sysadmin#metric--metric-collection
 **[`^        back to top        ^`](#)**
- [Ambar](https://ambar.cloud) - Document Search Engine (OCR, Store & Search) ([Demo](https://app.ambar.cloud/), [Source Code](https://github.com/RD17/ambar)) `MIT` `Nodejs/Python`  
+- [Ambar](https://ambar.cloud) - Document Search Engine (OCR, Store & Search). ([Demo](https://app.ambar.cloud/), [Source Code](https://github.com/RD17/ambar)) `MIT` `Nodejs/Python`  
 - [Gigablast](http://www.gigablast.com/) - open source search engine. ([Demo](http://www.gigablast.com/), [Source Code](https://github.com/gigablast/open-source-search-engine)) `Apache-2.0` `C++`
 - [Seeks](https://beniz.github.io/seeks/) - Web search proxy and collaborative distributed tool for websearch. ([Source Code](https://github.com/beniz/seeks)) `AGPL-3.0` `C++`
 - [Searx](https://asciimoo.github.io/searx/) - Privacy-respecting, hackable metasearch engine. ([Demo](https://searx.me/), [Source Code](https://github.com/asciimoo/searx)) `AGPL-3.0` `Python`
@ -1209,7 +1214,7 @@ See **[Ticketing](#ticketing)**
 *[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`
- [IronFunctions](https://github.com/iron-io/functions) - the serverless microservices platform by [iron.io](https://www.iron.io/) `Apache-2.0` `Go`
+- [IronFunctions](https://github.com/iron-io/functions) - The serverless microservices platform by [iron.io](https://www.iron.io/). `Apache-2.0` `Go`
 - [OpenFaaS](https://www.openfaas.com/) - Serverless Functions Made Simple for Docker & Kubernetes. ([Source Code](https://github.com/openfaas/faas)) `MIT` `Go`
 ### API Management
@ -1231,7 +1236,7 @@ See also [Static site generators](#static-site-generators)
 ### Localization
- [Accent](https://www.accent.reviews/) - Open-source, self-hosted, developer-oriented translation tool. ([Source code](https://github.com/mirego/accent)) `BSD-3-Clause` `Elixir`
+- [Accent](https://www.accent.reviews/) - Open-source, self-hosted, developer-oriented translation tool. ([Source Code](https://github.com/mirego/accent)) `BSD-3-Clause` `Elixir`
 - [Parrot](http://parrot-translate.github.io/parrot.github.io/) - Self-hosted Localization Management Platform built with Go and Angular 2. ([Source Code](https://github.com/parrot-translate/parrot)) `MIT` `Go`
 - [Pootle](http://pootle.translatehouse.org) - Online translation and localization tool. ([Source Code](https://github.com/translate/pootle)) `GPL-3.0` `Python`
 - [Weblate](https://weblate.org) - Web-based translation tool with tight version control integration. ([Demo](https://demo.weblate.org), [Source Code](https://github.com/WeblateOrg/weblate)) `GPL-3.0` `Python`
@ -1251,13 +1256,12 @@ 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`
 - [Wheatbin](http://wheatbin.com/) - Project management software that combines Kanban methodology with the Law of the Harvest. ([Source Code](https://github.com/wheatbin/wheatbin)) `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. ([Demo](https://chr15m.github.io/omgnata/)) `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`
- [TaskBoard](http://taskboard.matthewross.me/) - Kanban-inspired app for keeping track of things that need to get done. ([Source Code](https://github.com/kiswa/TaskBoard)) `MIT` `PHP`
+- [TaskBoard](http://taskboard.matthewross.me/) - Kanban-inspired app for keeping track of things that need to get done. ([Demo](https://taskboard.matthewross.me/demo.html), [Source Code](https://github.com/kiswa/TaskBoard)) `MIT` `PHP`
 - [Taskfreak](http://www.taskfreak.com/original) - Simple but efficient web based task manager written in PHP. ([Demo](http://demo.taskfreak.com/)) `GPL-3.0` `PHP`
 - [Tasks](https://github.com/m1guelpf/tasks) - Simple tasks and notes manager written in PHP, jQuery and Bootstrap using a custom flat file database. `MPL-2.0` `PHP`
 - [Tasks](https://github.com/thewhitetulip/Tasks) - Kanban based to-do list manager written in Go. `MIT` `Go`
@ -1266,8 +1270,9 @@ See https://staticsitegenerators.net and https://www.staticgen.com
 - [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`
 - [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. ([Source Code](https://github.com/garrettqmartin8/volition)) `MIT` `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`
 - [Wheatbin](http://wheatbin.com/) - Project management software that combines Kanban methodology with the Law of the Harvest. ([Source Code](https://github.com/wheatbin/wheatbin)) `MIT` `PHP`
 ## Ticketing
@ -1285,9 +1290,10 @@ See https://staticsitegenerators.net and https://www.staticgen.com
 - [Flyspray](http://www.flyspray.org/) - Uncomplicated, web-based bug tracking system. ([Source Code](https://github.com/Flyspray/flyspray)) `GPL-2.0` `PHP`
 - [HuBoard](https://github.com/huboard/huboard) `⚠` - Instant project management for your GitHub issues (Connects directly GitHub API). `MIT` `Ruby`
 - [MantisBT](https://www.mantisbt.org/) - Self hosted bug tracker, fits best for software development. ([Demo](https://www.mantisbt.org/bugs/my_view_page.php)), ([Source Code](https://github.com/mantisbt/mantisbt)) `GPL-2.0` `PHP`
- [osTicket](http://osticket.com/) -  Manage, organize and archive all your support requests and responses in one place. ([Source Code](https://github.com/osTicket/osTicket)) `GPL-2.0` `PHP`
+- [OpenSupports](https://www.opensupports.com/) - Multi language ticket system with FAQ, role management, metrics and canned response features. ([Demo](https://www.opensupports.com/demo/), [Source Code](https://github.com/opensupports/opensupports)) `GPL-3.0` `PHP`
 - [osTicket](http://osticket.com/) - Manage, organize and archive all your support requests and responses in one place. ([Source Code](https://github.com/osTicket/osTicket)) `GPL-2.0` `PHP`
 - [OTRS](http://www.otrs.com/) - Trouble ticket system for assigning tickets to incoming queries and tracking further communications. ([Source Code](https://github.com/OTRS/otrs)) `AGPL-3.0` `Perl`
- [Request Tracker](https://www.bestpractical.com/rt/) -  An enterprise-grade issue tracking system. ([Source Code](https://github.com/bestpractical/rt)) `GPL-2.0` `Perl`
+- [Request Tracker](https://www.bestpractical.com/rt/) - An enterprise-grade issue tracking system. ([Source Code](https://github.com/bestpractical/rt)) `GPL-2.0` `Perl`
 - [SIT](http://sit-it.org/) - SCM-agnostic, file-based, offline-first, immutable issue tracker. ([Source Code](https://github.com/sit-it/sit)) `MIT` `Apache-2.0` `Rust`.
 - [TheBugGenie](http://www.thebuggenie.org) - Ticket system with extensive user rights system. ([Source Code](https://github.com/thebuggenie/thebuggenie)) `MPL-2.0` `PHP`
 - [Zammad](https://zammad.org/) - Easy to use but powerful open-source support and ticketing system. ([Source Code](https://github.com/zammad/zammad)) `AGPL-3.0` `Ruby`
@ -1362,6 +1368,7 @@ See also [Documentation Generators](#documentation-generators), [Wikimatrix](htt
 - [FreedomBone](https://freedombone.net/) - Home server configuration based on Debian. ([Source Code](https://github.com/bashrc/freedombone)) `AGPL-3.0` `Shell`
 - [FreedomBox](https://wiki.debian.org/FreedomBox) - Community project to develop, design and promote personal servers running free software for private, personal, communications. `GPL-3.0` `Python/Other`
 - [FreeNAS](https://www.freenas.org/) - Network-attached storage (NAS) software based on FreeBSD and the OpenZFS file system. Support for SMB, AFP, NFS, iSCSI, SSH, rsync and FTP/TFTP protocols. Advanced features include full-disk encryption and plug-ins. ([Source Code](https://github.com/freenas/freenas)) `BSD-3-Clause` `Python/Other`
 - [HomelabOS](https://gitlab.com/NickBusey/HomelabOS) - Your very own offline-first privacy-centric open-source data-center. `MIT` `Docker`
 - [OpenMediaVault](http://www.openmediavault.org/) - OpenMediaVault is the next generation network attached storage (NAS) solution based on Debian Linux. It contains services like SSH, (S)FTP, SMB/CIFS, DAAP media server, RSync, BitTorrent client and many more. ([Source Code](https://github.com/openmediavault/openmediavault)) `GPL-3.0` `PHP`
 - [Piratebox](https://piratebox.cc/start) - DIY anonymous offline file-sharing and communications system built with free software and inexpensive off-the-shelf hardware. ([Source Code](https://github.com/PirateBox-Dev)). `GPL-3.0` `Python/Other`
 - [Puffin](http://puffin.rocks/) - Lightweight webapp catalog based on containers, with user interface à la mobile app store. ([Demo](http://puffin.rocks/), [Source Code](https://github.com/puffinrocks/puffin)) `AGPL-3.0` `Python/Docker`
@ -1429,6 +1436,7 @@ See also [Documentation Generators](#documentation-generators), [Wikimatrix](htt
 **[`^        back to top        ^`](#)**
 - [Awesome Big Data](https://github.com/onurakpolat/awesome-bigdata) - Curated list of awesome big data frameworks, resources and other awesomeness.
 - [Awesome Public Datasets](https://github.com/awesomedata/awesome-public-datasets) - List of high quality, topic-centric public data sources.
 - [Awesome Sysadmin](https://github.com/n1trux/awesome-sysadmin) - Curated list of amazingly awesome open source sysadmin resources.
 - Lists of software aimed at privacy and decentralization in some form: [PRISM Break](https://prism-break.org/en/), [privacytools.io](https://www.privacytools.io/), [Alternative Internet](https://redecentralize.github.io/alternative-internet/), [Libre Projects](http://libreprojects.net/)
 - Dynamic Domain Name services: [Afraid.org](https://freedns.afraid.org/domain/registry/), [Pagekite](https://pagekite.net/)
--- a/test.js
+++ b/test.js
@ -8,7 +8,7 @@ let issuelog = '  "message": "#### Syntax Issues\\n\\n Name | Entry\\n----|-----
 const file = fs.readFileSync(process.argv[2], 'utf8'); // Reads argv into var file
 function entryFilter(md) { // Function to find lines with entries
-  const linepatt = /^ {0,4}\* \[.*`/;
+  const linepatt = /^\s{0,2}-\s\[.*`/;
  return linepatt.test(md);
 }
@ -17,14 +17,14 @@ function split(text) { // Function to split lines into array
 }
 function findPattern(text) { // Test entries against 8 patterns.  If matches pattern returns true
-  const nodnospatt = /^ {0,4}\* \[.*?\]\(.*?\) - .{0,249}?\. `.*?` `.*?`/; // Regex for entries with no demo and no source code
+  const nodnospatt = /^\s{0,2}-\s\[.*?\]\(.*?\) - .{0,249}?\. `.*?` `.*?`/; // Regex for entries with no demo and no source code
-  const slpatt = /^ {0,4}\* \[.*?\]\(.*?\) - .{0,249}?\. \(\[Demo\b\]\(.*?\), \[Source Code\b\]\(.*?\)\) `.*?` `.*?`/; // Regex for entries with demo and source code
+  const slpatt = /^\s{0,2}-\s\[.*?\]\(.*?\) - .{0,249}?\. \(\[Demo\b\]\(.*?\), \[Source Code\b\]\(.*?\)\) `.*?` `.*?`/; // Regex for entries with demo and source code
-  const nodpatt = / {0,4}\* \[.*?\]\(.*?\) - .{0,249}?\. \(\[Source Code\]\(.*?\)\) `.*?` `.*?`/; // Regex for entries with no demo
+  const nodpatt = /^\s{0,2}-\s\[.*?\]\(.*?\) - .{0,249}?\. \(\[Source Code\]\(.*?\)\) `.*?` `.*?`/; // Regex for entries with no demo
-  const nospatt = / {0,4}\* \[.*?\]\(.*?\) - .{0,249}?\. \(\[Demo\]\(.*?\)\) `.*?` `.*?`/; // Regex for entries with no source code
+  const nospatt = /^\s{0,2}-\s\[.*?\]\(.*?\) - .{0,249}?\. \(\[Demo\]\(.*?\)\) `.*?` `.*?`/; // Regex for entries with no source code
-  const pnodnospatt = / {0,4}\* \[.*?\]\(.*?\) `⚠` - .{0,249}?\. `.*?` `.*?`/; // Regex for entries with proprietary with no demo and no source code
+  const pnodnospatt = /^\s{0,2}-\s\[.*?\]\(.*?\) `⚠` - .{0,249}?\. `.*?` `.*?`/; // Regex for entries with proprietary with no demo and no source code
-  const pslpatt = / {0,4}\* \[.*?\]\(.*?\) `⚠` - .{0,249}?\. \(\[Demo\b\]\(.*?\), \[Source Code\b\]\(.*?\)\) `.*?` `.*?`/; // Regex for entries with proprietary with demo and source code
+  const pslpatt = /^\s{0,2}-\s\[.*?\]\(.*?\) `⚠` - .{0,249}?\. \(\[Demo\b\]\(.*?\), \[Source Code\b\]\(.*?\)\) `.*?` `.*?`/; // Regex for entries with proprietary with demo and source code
-  const pnodpatt = / {0,4}\* \[.*?\]\(.*?\) `⚠` - .{0,249}?\. \(\[Source Code\]\(.*?\)\) `.*?` `.*?`/; // Regex for entries with proprietary with no demo
+  const pnodpatt = /^\s{0,2}-\s\[.*?\]\(.*?\) `⚠` - .{0,249}?\. \(\[Source Code\]\(.*?\)\) `.*?` `.*?`/; // Regex for entries with proprietary with no demo
-  const pnospatt = / {0,4}\* \[.*?\]\(.*?\) `⚠` - .{0,249}?\. \(\[Demo\]\(.*?\)\) `.*?` `.*?`/; // Regex for entries with proprietary with no source code
+  const pnospatt = /^\s{0,2}-\s\[.*?\]\(.*?\) `⚠` - .{0,249}?\. \(\[Demo\]\(.*?\)\) `.*?` `.*?`/; // Regex for entries with proprietary with no source code
  if (nodnospatt.test(text) === true) {
    return true;
  } else if (slpatt.test(text) === true) {
@ -46,7 +46,7 @@ function findPattern(text) { // Test entries against 8 patterns.  If matches pat
 }
 function entryErrorCheck(md) {
-  const namepatt = /\* \[(.*?)\]/; // regex pattern to find name of entryArray
+  const namepatt = /^\s{0,2}-\s\[(.*?)\]/; // regex pattern to find name of entryArray
  const entries = split(md); // Inserts each line into the entries array
  let totalFail = 0;
  let totalPass = 0;