diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-01-26 20:16:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-26 20:16:31 +0100 |
commit | cfa92c4ec025609c24c24d73114033ecf150a438 (patch) | |
tree | af42722e4bdef8f4fcc4a43268e8ef033bf38a81 /app/controllers/settings/preferences/other_controller.rb | |
parent | 20abef6590505d12aca81ed1c386804d75b8b552 (diff) | |
parent | fad6633156cae8ab2a7bad0c9802cf7918964ef4 (diff) |
Merge pull request #2095 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings/preferences/other_controller.rb')
0 files changed, 0 insertions, 0 deletions