Raphael f8e7d3f313 RS, IZ; Rolling back special casing of friend-request		2010-08-05 11:14:40 -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	RS, IZ; Rolling back special casing of friend-request	2010-08-05 11:14:40 -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