Raphael 1312728b88 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: public/stylesheets/application.css public/stylesheets/sass/application.sass		2010-09-13 11:16:45 -07:00
..
controllers	Rename files from group to aspect	2010-09-13 10:43:15 -07:00
helpers	Rename files from group to aspect	2010-09-13 10:43:15 -07:00
models	Rename files from group to aspect	2010-09-13 10:43:15 -07:00
uploaders	made photos for album previews 200x200, small thumbnails now at 50x50	2010-08-26 15:13:33 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-13 11:16:45 -07:00