Raphael d71966476b Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top ... Conflicts: app/views/albums/show.html.haml app/views/authors/show.html.haml app/views/layouts/application.html.haml app/views/photos/show.html.haml		2010-08-09 15:09:05 -07:00
..
images	Hamiltom picture	2010-08-04 15:22:45 -07:00
javascripts	small color changes	2010-08-06 00:40:44 -07:00
stylesheets	Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top	2010-08-09 15:09:05 -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	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