danielvincent 36adf1b6fd Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor		2010-08-09 21:10:31 -07:00
..
controllers	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-09 21:10:31 -07:00
helpers	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-09 21:10:31 -07:00
models	MS IZ fixed a couple of failing specs in the parser	2010-08-09 21:09:51 -07:00
uploaders	Fixed Photos, and Carrierwave initializer	2010-08-02 21:31:14 -07:00
views	changed the pop-up boxes. going to probably switch to fancybox jquery plugin... also, fixed the user page so viewing it doesn't throw an error.	2010-08-09 21:10:11 -07:00