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
..
images	more cleanup	2010-09-13 11:05:10 -07:00
javascripts	Big clean up: delete trailing whitespace	2010-09-26 12:48:40 -04:00
stylesheets	Merge branch 'master' of github.com:diaspora/diaspora into fb	2010-09-27 15:39:50 -07:00
404.html	more informative 400 and 500 pages	2010-09-13 15:24:15 -07:00
422.html	Activerecord this time\!	2010-06-11 10:40:49 -07:00
500.html	more informative 400 and 500 pages	2010-09-13 15:24:15 -07:00
favicon.ico	added favicon from pubsite	2010-06-29 22:14:39 -07:00
robots.txt	Activerecord this time\!	2010-06-11 10:40:49 -07:00