danielvincent 7a556e1b3c Merge branch 'master' of github.com:diaspora/diaspora_rails into friend-refactor		2010-08-04 19:23:56 -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	Merge branch 'master' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-04 19:23:56 -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