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

You need to sign in or sign up before continuing.

Resolve conflicts after CE merge · a3ea22c6

Dmitriy Zaporozhets authored Sep 20, 2018



For next files:

- app/controllers/admin/application_settings_controller.rb
- config/routes/admin.rb
- locale/gitlab.pot

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

a3ea22c6