app/controllers/admin/application_settings_controller.rb · 018a7c6a550494a7dd386450b464d5692413f319 · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

Skip to content

GitLab

Explore

Sign in

gitlab-ce
app
controllers
admin
application_settings_controller.rb

Blame Permalink

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

Loading