Clement Ho 35659da185 Merge branch 'master' into 'fix-btn-alignment' ... # Conflicts: # app/views/projects/merge_requests/_nav_btns.html.haml		2017-08-15 14:25:08 +00:00
..
images	[ci skip] Adds svgs and css for all icons	2017-08-01 13:25:52 +01:00
javascripts	Merge branch '36450_confi_polish' into 'master'	2017-08-15 13:50:07 +00:00
stylesheets	Merge branch 'master' into 'fix-btn-alignment'	2017-08-15 14:25:08 +00:00