about summary refs log tree commit diff
path: root/spec/controllers/settings
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-05-08 21:45:59 +0200
committerGitHub <noreply@github.com>2022-05-08 21:45:59 +0200
commite8b8ac8908c6623f0fd7ffccc7de3882a773b72f (patch)
tree14c554ab68d0f1ab29f2862afb2f306da2127323 /spec/controllers/settings
parentd7eae4229c3a0b5dd783888953004cfd9777cffd (diff)
parentdc1685c1e65cd6a2c176fe4a50a92fbc468f3b75 (diff)
Merge pull request #1766 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/controllers/settings')
0 files changed, 0 insertions, 0 deletions