diff options
| author | ThibG <thib@sitedethib.com> | 2018-07-18 22:38:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-18 22:38:43 +0200 |
| commit | baf42ef0b3347e232b2a6063d3bd1e831f2b098f (patch) | |
| tree | bb1087f2038f50779455827f0d0373483b83fa3b /app/controllers/admin/settings_controller.rb | |
| parent | f328d20ff82139640f669d3484a6ed7b56bea5ef (diff) | |
| parent | b9d5d8982d337311450c0155d397bbc6f11c3a48 (diff) | |
Merge pull request #590 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/admin/settings_controller.rb')
0 files changed, 0 insertions, 0 deletions