diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-14 17:14:05 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-14 17:17:20 +0100 |
| commit | 07eb31eeacc4e0364b839233a41fa65eb3c650ce (patch) | |
| tree | 843cda5a4d9bc730aba9a13d0634fef5e2212515 /config/application.rb | |
| parent | fa75324059c7a146354470691888dc0e1de0342f (diff) | |
| parent | 874bd3ac0c56e2d2901785e170b27f5cde32b33b (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.
Diffstat (limited to 'config/application.rb')
0 files changed, 0 insertions, 0 deletions