app/controllers/admin/application_settings_controller.rb · 47c7771e38b5959c7fc4943f8a99aea344a2ef4d · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

Blame History Permalink

Fix conflict in app/controllers/admin/application_settings_controller.rb · b1d3090e
Dmitriy Zaporozhets authored Apr 17, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
b1d3090e

application_settings_controller.rb 2.55 KB