danielvincent 5be27f33ec Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: app/views/layouts/application.html.haml app/views/status_messages/_status_message.html.haml		2010-06-27 10:32:23 -07:00
..
images	more shuffling	2010-06-19 14:44:08 -07:00
javascripts	removed socket.js	2010-06-26 02:08:19 -04:00
stylesheets	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-27 10:32:23 -07:00
404.html	Activerecord this time\!	2010-06-11 10:40:49 -07:00
422.html	Activerecord this time\!	2010-06-11 10:40:49 -07:00
500.html	Activerecord this time\!	2010-06-11 10:40:49 -07:00
favicon.ico	Activerecord this time\!	2010-06-11 10:40:49 -07:00
robots.txt	Activerecord this time\!	2010-06-11 10:40:49 -07:00