Merge branch 'stable' into develop

This commit is contained in:
Jonne Haß 2015-09-14 21:50:17 +02:00
commit f74450fa2f

16
AUTHORS
View file

@ -1,11 +1,7 @@
Diaspora is written by: diaspora* was initially developed by:
Daniel Grippi - Ilya Zhitomirskiy
Ilya Zhitomirskiy - Raphael Sofaer
Maxwell Salzberg - Daniel Grippi
Raphael Sofaer - Maxwell Salzberg
With help from many libraries and frameworks including: It lives on as an open source project with many contributors, a self updating list is at: https://github.com/diaspora/diaspora/graphs/contributors
JQuery
Ruby on Rails
Blueprint-CSS
and others