about summary refs log tree commit diff
path: root/app/controllers/settings/preferences/notifications_controller.rb
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-02-12 14:33:01 +0100
committerGitHub <noreply@github.com>2022-02-12 14:33:01 +0100
commitf61137b7ffb97006ab811f8a4bce017b5f07f85d (patch)
treeff70b757d86a44665d16c8021cb81f8e04f396a7 /app/controllers/settings/preferences/notifications_controller.rb
parent28ec7def5869ff1a85f49a070b9575c166a432ee (diff)
parentf4db2e1832e40cbdfd81feda24fcf87c96f6dbd5 (diff)
Merge pull request #1688 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings/preferences/notifications_controller.rb')
0 files changed, 0 insertions, 0 deletions