maxwell c6778b942f Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: app/views/layouts/application.html.haml		2010-11-17 21:57:48 -08:00
..
_header.html.haml	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
application.html.haml	Merge branch 'master' of github.com:diaspora/diaspora	2010-11-17 21:57:48 -08:00
application.mobile.haml	upgraded jquery, and deleted a second version of both jqueries	2010-11-16 21:41:20 -08:00
notifier.html.haml	Refactor mail views, add a spec to make sure CSS is rendered	2010-11-12 11:47:59 -08:00