app/controllers/admin/application_settings_controller.rb · c07311d486fd177bff6df8b2f912dc91dcadac4e · nexedi / gitlab-ce · GitLab

You need to sign in or sign up before continuing.

Find file Blame History Permalink

Merge branch 'master' into 'jej-pages-to-ce' · b988faaf
James Edwards-Jones authored Feb 06, 2017
```
# Conflicts:
#   db/schema.rb
```
b988faaf