Raphael d71966476b Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top ... Conflicts: app/views/albums/show.html.haml app/views/authors/show.html.haml app/views/layouts/application.html.haml app/views/photos/show.html.haml		2010-08-09 15:09:05 -07:00
..
controllers	Changed info logging to debug logging almost everywhere	2010-08-09 14:39:37 -07:00
helpers	Person.new in dev seed	2010-08-09 13:03:27 -07:00
models	Changed info logging to debug logging almost everywhere	2010-08-09 14:39:37 -07:00
uploaders	Fixed Photos, and Carrierwave initializer	2010-08-02 21:31:14 -07:00
views	Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top	2010-08-09 15:09:05 -07:00