maxwell 1adf93ace1 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: config/locales/diaspora/en.yml		2010-11-22 16:40:01 -08:00
..
images	added icons for the connected services and to indicate the rss feed	2010-11-18 12:19:58 -08:00
javascripts	Merge branch 'master' of github.com:diaspora/diaspora	2010-11-22 16:40:01 -08:00
stylesheets	firefox bugfix on photo#show	2010-11-22 14:52:13 -08:00
404.html	made 404 page message clearer.	2010-10-28 14:07:52 -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
apple-touch-icon.png	cleaned up meta and link tags in layout, added retina iOS icon, fixed error caused in stream_element when socketing	2010-11-17 21:21:00 -08: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