about summary refs log tree commit diff
path: root/app/views/admin/settings
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-06-24 15:16:38 +0200
committerGitHub <noreply@github.com>2021-06-24 15:16:38 +0200
commit2a4e44a725db57b8b506de6b09926bd977d4c504 (patch)
treef0e0c38291c304e47c64f0f947b9982615523e74 /app/views/admin/settings
parent776e00f19399875a135a64d8ad486f3578101cf9 (diff)
parent86aca08ec6c1034e69c284b5b5e7b1020a30dff8 (diff)
Merge pull request #1553 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin/settings')
0 files changed, 0 insertions, 0 deletions