danielvincent 8ed98270a6 Merge branch 'master' of github.com:diaspora/diaspora into fb ... Conflicts: config/routes.rb		2010-09-22 16:09:25 -07:00
..
albums
aspects	DG IZ moving friends is now ajaxy	2010-09-20 17:26:20 -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
photos
posts
publics
registrations	RS, IZ; removed url from user and views	2010-09-21 15:52:26 -07:00
requests
shared	DG IZ; reshare redirects to specific page	2010-09-22 15:32:11 -07:00
status_messages	DG IZ; reposting now works. redirects to a template missing page, though.	2010-09-22 15:05:51 -07:00
users	Merge branch 'master' of github.com:diaspora/diaspora into fb	2010-09-22 16:09:25 -07:00