danielvincent 0c16038e2d Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: app/views/layouts/application.html.haml public/stylesheets/application.css public/stylesheets/sass/application.sass		2010-06-29 17:30:29 -07:00
..
images	The photo	2010-06-28 23:40:34 -04:00
javascripts	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-29 17:30:29 -07:00
stylesheets	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-29 17:30:29 -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