danielvincent d6bc93fb96 commented out retraction on unfriending due to ROXML messing things up ... .		2010-08-04 23:47:27 -07:00
..
controllers	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-08-04 16:01:37 -07:00
helpers	RS, IZ; extracted and murdered ostatus.	2010-08-04 16:00:01 -07:00
models	commented out retraction on unfriending due to ROXML messing things up	2010-08-04 23:47:27 -07:00
uploaders	Fixed Photos, and Carrierwave initializer	2010-08-02 21:31:14 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-08-04 16:01:37 -07:00