diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-22 03:34:58 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-22 03:34:58 +0100 |
| commit | acfee0945cb2b552be71e7c33b437ca6e8e8d988 (patch) | |
| tree | 3231f9e1a226ecaaa1de531cfae4f91ca320c0b7 /app/controllers/admin/settings_controller.rb | |
| parent | 05cf086766396745219582951f9b792ac5ed2bfb (diff) | |
| parent | 8aae42f3d8033d4a71774127a3e1a60013a54196 (diff) | |
Merge branch 'master' into feature-omnisearch
this merge is necessary,
Diffstat (limited to 'app/controllers/admin/settings_controller.rb')
0 files changed, 0 insertions, 0 deletions