config/gitlab.yml.example · bf89c2a36f2a60a75cbcf72e26b88c1d3ce1e26f · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-09 · 3f1f13d6
GitLab Bot authored Jul 09, 2018
```
# Conflicts:
#	db/schema.rb
#	doc/ci/variables/README.md
#	locale/gitlab.pot

[ci skip]
```
3f1f13d6