Merge branch 'stable' into develop

2015-09-14 21:50:17 +02:00 · 2015-09-14 21:50:17 +02:00 · f74450fa2f
commit f74450fa2f
parent 6407b446fc 8fb1116da5
1 changed files with 6 additions and 10 deletions
--- a/16
+++ b/16
@ -1,11 +1,7 @@
-Diaspora is written by:
-  Daniel Grippi
-  Ilya Zhitomirskiy
-  Maxwell Salzberg
-  Raphael Sofaer
+diaspora* was initially developed by:
+-  Ilya Zhitomirskiy
+-  Raphael Sofaer
+-  Daniel Grippi
+-  Maxwell Salzberg

-With help from many libraries and frameworks including:
-  JQuery
-  Ruby on Rails
-  Blueprint-CSS
-  and others
+It lives on as an open source project with many contributors, a self updating list is at: https://github.com/diaspora/diaspora/graphs/contributors