diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-05-16 10:43:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-16 10:43:44 +0200 |
commit | 3a084113067656ef9318b9fb5bcfea4fd2de6ffe (patch) | |
tree | 251a14cd362a6d98c1721e8f3f54fc386165e464 /spec/controllers/settings | |
parent | 94e98864e39c010635e839fea984f2b4893bef1a (diff) | |
parent | 040b7d37a460e5f023f7654b1b619368cbbc24ea (diff) |
Merge pull request #1772 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/controllers/settings')
0 files changed, 0 insertions, 0 deletions