about summary refs log tree commit diff
path: root/app/controllers/settings/preferences_controller.rb
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-11-15 02:11:22 +0100
committerGitHub <noreply@github.com>2022-11-15 02:11:22 +0100
commiteb675af0fb0d73b697e066100c4faf066c0baff7 (patch)
treec4a449a9d3cb1f513d8ba45b368e44e98c2b4ce4 /app/controllers/settings/preferences_controller.rb
parentceafd1f68f1f1b57c998adf693678059f9aaa70c (diff)
parent66461ae79ab407beaaf41a3b5b939f2cc7e6936e (diff)
Merge pull request #1932 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings/preferences_controller.rb')
0 files changed, 0 insertions, 0 deletions