Clement Ho f9e2b4730f Merge branch 'master' into 'bootstrap4' ... # Conflicts: # app/views/projects/branches/_branch.html.haml		2018-05-01 16:21:47 +00:00
..
images	Merge branch '8088_embedded_snippets_support' into 'master'	2018-04-16 10:56:16 +00:00
javascripts	Merge branch 'master' into 'bootstrap4'	2018-05-01 16:21:47 +00:00
stylesheets	Merge branch 'master' into 'bootstrap4'	2018-05-01 16:21:47 +00:00