maxwell 85b824babc Merge branch 'master' of github.com:diaspora/diaspora		2011-01-18 22:12:11 -08:00
..
controllers	Merge branch 'master' of github.com:diaspora/diaspora	2011-01-18 22:12:11 -08:00
helpers	fixed the querying in the controllers got rid of hashes	2011-01-18 16:21:14 -08:00
mailers	Merge almost complete, 4 failures	2011-01-14 16:00:10 -08:00
models	notification eagerly load the target	2011-01-18 17:22:48 -08:00
uploaders	remove s3 setting	2011-01-17 16:46:39 -08:00
views	fix invitations#new, and a post spec which was mongo specific	2011-01-18 22:11:58 -08:00