Douwe Maan fae08104b4 Merge branch 'master' into mr-broken ... # Conflicts: # app/helpers/ci_status_helper.rb		2015-12-08 22:38:29 +01:00
..
fonts	Update SourceSansPro fonts	2015-10-21 12:15:39 +02:00
images	Make icon-link image transparent	2015-12-01 18:20:01 -05:00
javascripts	Merge remote-tracking branch 'origin/ui/misc'	2015-12-08 18:50:02 +01:00
stylesheets	Merge branch 'master' into mr-broken	2015-12-08 22:38:29 +01:00