Hannah Wolfe 06b5ab86fb Merge branch 'pr119-merged' ... Conflicts: core/admin/views/settings.hbs		2013-06-11 11:56:01 +01:00
..
fonts	Adding new icons: reply, repost, weather (sun/partial/cloud/rain/snow) for Dashboard. See #65	2013-05-30 11:39:14 +02:00
img	implements #38 html and scss for uploader	2013-06-10 20:07:34 +01:00
js	Merge branch 'pr/119'	2013-06-09 21:41:07 +01:00
lib	implements #38 html and scss for uploader	2013-06-10 20:07:34 +01:00
sass	implements #38 html and scss for uploader	2013-06-10 20:07:34 +01:00
tmpl/content	Converted static Widgets to Backbone.	2013-06-09 10:56:10 +01:00