diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-01-31 10:51:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-31 10:51:11 +0100 |
commit | d6f3261c6cb810ea4eb6f74b9ee62af0d94cbd52 (patch) | |
tree | f748ae22df0d67bf5b9ba393a912fd5b883a32ce /app/controllers/settings/base_controller.rb | |
parent | b54e263712a9f2b3d4ff0d7b692565d8e24dc03b (diff) | |
parent | 2fcf652fffa6d7d9ab19d23dcb24c6d68edbc9c3 (diff) |
Merge pull request #1674 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