maxwell 9bd77916a8 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: public/stylesheets/sass/application.sass		2010-12-02 19:18:21 -08:00
..
images	fixed diaspora logo asset on landing page	2010-12-01 16:18:13 -08:00
javascripts	enabling dragging and dropping between aspects on aspect manage. removed ability to remove a contact from aspects#manage after removing from a single aspect. fixed notification popup z-index.	2010-12-02 17:36:46 -08:00
stylesheets	Merge branch 'master' of github.com:diaspora/diaspora	2010-12-02 19:18:21 -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