Skip to content
GitLab
Explore
Sign in
Register
nexedi
gitlab-ce
Repository
gitlab-ce
locale
gitlab.pot
Find file
Blame
History
Permalink
Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-02
· 2b6b7b2e
GitLab Bot
authored
Oct 02, 2018
# Conflicts: # db/schema.rb # locale/gitlab.pot # qa/qa/page/menu/admin.rb [ci skip]
2b6b7b2e