Raphael cc3819c256 Forgot a merge conflict		2010-09-22 21:39:22 -07:00
..
albums	Merge branch 'master' into HEAD	2010-09-22 21:32:03 -07:00
aspects	Forgot a merge conflict	2010-09-22 21:39:22 -07:00
comments	removed the auto_link seems to fix HTML injection, no more autolinking	2010-09-21 11:59:04 -07:00
devise	RS, IZ; removed url from user and views	2010-09-21 15:52:26 -07:00
js
layouts
people	Merge branch 'master' into HEAD	2010-09-22 21:32:03 -07:00
photos	merged with diaspora master; this fork has spanish, german and french translations (need some help with the last two)	2010-09-18 02:21:45 -04:00
posts
publics
registrations	Merge branch 'master' into HEAD	2010-09-22 21:32:03 -07:00
requests
shared	Merge branch 'master' into HEAD	2010-09-22 21:32:03 -07:00
status_messages	Merge branch 'master' into HEAD	2010-09-22 21:32:03 -07:00
users	Merge branch 'master' into HEAD	2010-09-22 21:32:03 -07:00