summaryrefslogtreecommitdiff
path: root/config/locales
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-03-07 11:40:27 +0000
committerPhil Hughes <me@iamphill.com>2017-03-07 11:40:27 +0000
commit12fe94c388ae9ec73e34852ef7d7b90f2f347df7 (patch)
tree5182f89deddf9428b1d6ca70720f8ac8ee2b940a /config/locales
parent002d3a3e72de57c76a077ed5d09e857243c7effd (diff)
parentac9d792946deb17a402646e5481087e4d92f88ad (diff)
downloadgitlab-ce-12fe94c388ae9ec73e34852ef7d7b90f2f347df7.tar.gz
Merge branch 'master' into 26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages
Diffstat (limited to 'config/locales')
0 files changed, 0 insertions, 0 deletions