diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-06-16 12:42:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-16 12:42:40 +0200 |
| commit | a434f370f38ac66e05000545e36d7c696f4962d0 (patch) | |
| tree | 7ca43e484bb6111c2f219adb47e11a4445e38917 /app/controllers/settings | |
| parent | db5baf3d1a93cbf6961f721205cff0beaf71bffd (diff) | |
| parent | 6dd51448a6ba318d3007169c443f6613a0944eea (diff) | |
Merge pull request #1550 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings')
0 files changed, 0 insertions, 0 deletions