Clement Ho 43fa9c1f1a Merge branch 'master' into 'master' ... on branch deletion show loading icon and disabled the button See merge request !6761		2017-02-23 17:35:09 +00:00
..
images	Merge branch 'feature/brand-logo-in-emails' into 'master'	2017-02-22 16:20:46 +00:00
javascripts	Merge branch 'master' into 'master'	2017-02-23 17:35:09 +00:00
stylesheets	Merge branch '28495-content-shifting' into 'master'	2017-02-23 09:10:35 +00:00