diff options
author | ThibG <thib@sitedethib.com> | 2020-12-05 22:03:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-05 22:03:28 +0100 |
commit | 25f725d67a6d2542cd586ab7c56baca572eb4f88 (patch) | |
tree | 4272423a87ddacaf63efc0ee6cd8df4a63e61419 /app/controllers/settings | |
parent | 13df125b6c75923ccc21a5c57053e680cea75f38 (diff) | |
parent | 40e2de3904c553f3fe4ec30cdbe3ae0e89796291 (diff) |
Merge pull request #1470 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings')
0 files changed, 0 insertions, 0 deletions