about summary refs log tree commit diff
path: root/app/controllers/settings/preferences/other_controller.rb
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2023-01-26 20:16:31 +0100
committerGitHub <noreply@github.com>2023-01-26 20:16:31 +0100
commitcfa92c4ec025609c24c24d73114033ecf150a438 (patch)
treeaf42722e4bdef8f4fcc4a43268e8ef033bf38a81 /app/controllers/settings/preferences/other_controller.rb
parent20abef6590505d12aca81ed1c386804d75b8b552 (diff)
parentfad6633156cae8ab2a7bad0c9802cf7918964ef4 (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