maxwell 9d41ed3ef1 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor		2010-08-09 21:10:14 -07:00
..
controllers	MS IZ fixed a couple of failing specs in the parser	2010-08-09 21:09:51 -07:00
helpers	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-09 19:05:12 -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	removed commented out stuff on photo_new partial. also, fixed the delete button in photo show.	2010-08-09 20:18:20 -07:00