ilya 08b9aa864a Merge branch 'master' of github.com:diaspora/diaspora into fb ... Conflicts: app/views/layouts/application.html.haml app/views/shared/_publisher.haml app/views/shared/_sub_header.haml app/views/users/edit.html.haml config/deploy_config.yml config/routes.rb		2010-09-27 15:39:50 -07:00
..
blueprint	Adding in COPYRIGHT, AUTHORS, and blueprint attribution	2010-09-15 10:09:42 -07:00
brandongrotesque_light	warming up the page. colors were too cold and non-human before.	2010-07-05 00:02:16 -07:00
sass	Merge branch 'master' of github.com:diaspora/diaspora into fb	2010-09-27 15:39:50 -07:00
.gitkeep	Activerecord this time\!	2010-06-11 10:40:49 -07:00
application.css	Merge branch 'master' of github.com:diaspora/diaspora into fb	2010-09-27 15:39:50 -07:00
fileuploader.css	minor changes from production	2010-09-20 21:50:06 -07:00
loading.gif	DG IZ; changed the photo uploader to drag and drop. now works in firefox.	2010-09-07 17:20:48 -07:00
sessions.css	MS added pagination to the search page	2010-09-16 11:47:34 -07:00
ui.css	removed some unneeded sass	2010-09-13 11:16:59 -07:00