diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-26 21:23:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-26 21:23:55 +0100 |
| commit | df60524b309f3eb5c7997cf6cbd609ca6e74db29 (patch) | |
| tree | ef531c0cfe383c719f387f2fa6b33422f87a11a1 /app/controllers/settings/base_controller.rb | |
| parent | 551820cbd9e5beebd16f16205143e2263d4f2d51 (diff) | |
| parent | 0a5a703a56a1f93fda84d537bc09bfbe45210494 (diff) | |
Merge pull request #1707 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings/base_controller.rb')
0 files changed, 0 insertions, 0 deletions