ilya b0455b9532 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor		2010-08-11 17:45:13 -07:00
..
controllers	RS, DG; Cleaned up the switch in user.receive	2010-08-11 16:01:16 -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 17:45:13 -07:00
uploaders	Fixed Photos, and Carrierwave initializer	2010-08-02 21:31:14 -07:00
views	DG, RS; album button looks better	2010-08-11 17:16:20 -07:00