maxwell b9718c079b Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor		2010-08-10 16:05:10 -07:00
..
controllers	RS, DG; You can now sign up to be a user on a seed	2010-08-10 16:03:38 -07:00
helpers	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-10 16:03:54 -07:00
models	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-10 16:05:10 -07:00
uploaders	Fixed Photos, and Carrierwave initializer	2010-08-02 21:31:14 -07:00
views	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-10 16:03:54 -07:00