Merge branch 'master' into tag-colour-preview-rebase
authorStefan Baebler <sbaebler@outbrain.com>
Sat, 31 Aug 2019 09:34:57 +0000 (11:34 +0200)
committerStefan Baebler <sbaebler@outbrain.com>
Sat, 31 Aug 2019 09:34:57 +0000 (11:34 +0200)
commite731dd71a77ad4ad1e9db22535e89444bb98e5d9
treeb53aa9625037b1875eb9021af99c4b0c3aed1edb
parent26b47fdd188d126bef2e5829d5cc460bad530e2a
parent7c8779709f6be1cf242dedaaf826cadb3da88e66
Merge branch 'master' into tag-colour-preview-rebase
app/assets/javascripts/index.js
app/assets/stylesheets/common.scss
config/locales/en.yml