Raphael d7828a8bf3 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor ... Conflicts: spec/controllers/publics_controller_spec.rb		2010-08-11 13:59:21 -07:00
..
controllers	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-11 13:59:21 -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-11 13:59:21 -07:00
uploaders	Fixed Photos, and Carrierwave initializer	2010-08-02 21:31:14 -07:00
views	Moved socket code out to lib, unsocketing from view should now work again	2010-08-11 12:03:26 -07:00