diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-07-13 23:55:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-13 23:55:09 +0200 |
| commit | e42ed4502f9e4a599ecf7a860b7de80090ba46ad (patch) | |
| tree | 224cbc337acea85bd7a358fb4985f0362432cf38 /spec/controllers/settings | |
| parent | 82bc8e764798b74f475763136117592526d905fa (diff) | |
| parent | fc500a606225b56c3da7eaebf2bfb94e9cc97d2f (diff) | |
Merge pull request #1567 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/controllers/settings')
0 files changed, 0 insertions, 0 deletions