From 3e0738bc525af719ff7cb3c4376fa8240657e2be Mon Sep 17 00:00:00 2001
From: Christoph Kappestein <k42b3.x@gmail.com>
Date: Thu, 25 Aug 2016 22:54:36 +0200
Subject: [PATCH 1/5] add fusio

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index d17c7609..3c9ab8d4 100644
--- a/README.md
+++ b/README.md
@@ -638,6 +638,7 @@ See also <https://en.wikipedia.org/wiki/List_of_streaming_media_systems>, <https
 
 ## Misc/Other
 
+  * [Fusio](http://www.fusio-project.org/) - Fusio is an open source API management platform which helps to build and manage REST APIs. ([Demo](http://demo.fusio-project.org/backend.htm), [Source Code](https://github.com/apioo/fusio)) `AGPLv3` `PHP`
   * [GeneWeb](https://geneweb.tuxfamily.org/wiki/GeneWeb) - GeneWeb is an open source genealogy software written in OCaml. It comes with a Web interface and can be used off-line or as a Web service. ([Demo](https://demo.geneweb.tuxfamily.org/gw7/), [Source Code](https://github.com/geneweb/geneweb)) `GPLv2` `OCAML`
   * [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`
   * [Mindmaps](https://github.com/drichard/mindmaps) - An open source, offline capable, mind mapping application. ([Demo](http://drichard.org/mindmaps/)) `AGPLv3` `HTML5`

From 6bfc37a0df8116a52f045e109ac27716fca929c4 Mon Sep 17 00:00:00 2001
From: nrew225 <nrew225@gmail.com>
Date: Sat, 27 Aug 2016 07:34:36 -0700
Subject: [PATCH 2/5] resolve conflict

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 8575617c..33e0849d 100644
--- a/README.md
+++ b/README.md
@@ -639,6 +639,7 @@ See also <https://en.wikipedia.org/wiki/List_of_streaming_media_systems>, <https
 
 ## Misc/Other
 
+  * [EasyBook Project](http://easybook-project.org/) - Book publishing as easy as it should be. ([Source Code](https://github.com/javiereguiluz/easybook)) `MIT` `PHP`
   * [Fusio](http://www.fusio-project.org/) - Fusio is an open source API management platform which helps to build and manage REST APIs. ([Demo](http://demo.fusio-project.org/backend.htm), [Source Code](https://github.com/apioo/fusio)) `AGPLv3` `PHP`
   * [GeneWeb](https://geneweb.tuxfamily.org/wiki/GeneWeb) - GeneWeb is an open source genealogy software written in OCaml. It comes with a Web interface and can be used off-line or as a Web service. ([Demo](https://demo.geneweb.tuxfamily.org/gw7/), [Source Code](https://github.com/geneweb/geneweb)) `GPLv2` `OCAML`
   * [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`

From 5e39d5047e96f43593af6b465b4de2ebe221af12 Mon Sep 17 00:00:00 2001
From: Edward D <ed.kickball@hotmail.com>
Date: Sun, 28 Aug 2016 02:55:35 +0200
Subject: [PATCH 3/5] Add chat button (#730)

* Add Join Chat Button

* Add Button Link in README

Currently broken

* Fix button link
---
 .github/join-chat.svg | 1 +
 README.md             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 .github/join-chat.svg

diff --git a/.github/join-chat.svg b/.github/join-chat.svg
new file mode 100644
index 00000000..7faac520
--- /dev/null
+++ b/.github/join-chat.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="148" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="a"><rect width="148" height="20" rx="3" fill="#fff"/></mask><g mask="url(#a)"><path fill="#555" d="M0 0h77v20H0z"/><path fill="#4c1" d="M77 0h71v20H77z"/><path fill="url(#b)" d="M0 0h148v20H0z"/></g><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"><text x="38.5" y="15" fill="#010101" fill-opacity=".3">Rocket.Chat</text><text x="38.5" y="14">Rocket.Chat</text><text x="111.5" y="15" fill="#010101" fill-opacity=".3">JOIN CHAT</text><text x="111.5" y="14">JOIN CHAT</text></g></svg>
\ No newline at end of file
diff --git a/README.md b/README.md
index 9dc362df..51f124b4 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Awesome-Selfhosted
 
-[![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome)
+[![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome) [![Chat](https://raw.githubusercontent.com/Kickball/awesome-selfhosted/master/.github/join-chat.svg)](https://chat.awesome-selfhosted.com)
 
 Selfhosting is the process of locally hosting and managing applications instead of renting from SaaS providers.
 

From ca5583e384bdf37b2fa74dbddea73c30b12c0702 Mon Sep 17 00:00:00 2001
From: Edward D <ed.kickball@hotmail.com>
Date: Sat, 27 Aug 2016 20:58:34 -0400
Subject: [PATCH 4/5] Join Chat Button Fix

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 51f124b4..f3474aa6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Awesome-Selfhosted
 
-[![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome) [![Chat](https://raw.githubusercontent.com/Kickball/awesome-selfhosted/master/.github/join-chat.svg)](https://chat.awesome-selfhosted.com)
+[![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome) [![](https://camo.githubusercontent.com/3d659054abd6ce21c0e47cf3b83a51bda69ca282/68747470733a2f2f64656d6f2e726f636b65742e636861742f696d616765732f6a6f696e2d636861742e737667)](https://chat.awesome-selfhosted.com)
 
 Selfhosting is the process of locally hosting and managing applications instead of renting from SaaS providers.
 

From 8d923d869eb087177f2063f031f577c8c1dfa338 Mon Sep 17 00:00:00 2001
From: vincent-clipet <vincent.clipet.7@gmail.com>
Date: Sun, 28 Aug 2016 04:02:48 +0200
Subject: [PATCH 5/5] ADD :: Demo & source URL for Redmine

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f3474aa6..f87691b7 100644
--- a/README.md
+++ b/README.md
@@ -821,7 +821,7 @@ See also [Ticketing](#ticketing), [Task management/To-do lists](#task-management
   * [Lavagna](http://lavagna.io) - Lavagna is an open-source issue/project management tool designed for small teams. Lightweight, pure Java, easy to install, easy to use. ([Source Code](https://github.com/digitalfondue/lavagna)) `GPLv3` `Java`
   * [OpenProject](https://www.openproject.org) - Project collaboration.
   * [Phabricator](http://phabricator.org/) - Collection of web applications that help build better software. ([Demo](https://secure.phabricator.com/), [Source Code](https://github.com/phacility/phabricator)) `Apache` `PHP`
-  * [Redmine](http://www.redmine.org/) - Redmine is a flexible project management web application. `GPLv2` `Ruby`
+  * [Redmine](http://www.redmine.org/) - Redmine is a flexible project management web application. ([Demo](http://demo.redmine.org/), [Source Code](https://svn.redmine.org/redmine/)) `GPLv2` `Ruby`
   * [Taiga](https://taiga.io/) - Agile Project Management Tool based on the Kanban and Scrum methods.  ([Source Code](https://github.com/taigaio))
   * [The Bug Genie](http://www.thebuggenie.com/) - Written in PHP.
   * [Trac](http://trac.edgewall.org/) - Written in python.