diff options
author | ThibG <thib@sitedethib.com> | 2020-06-01 19:41:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-01 19:41:33 +0200 |
commit | f328f2faa3fbdb182921366c6a20e745c069b840 (patch) | |
tree | 39b6adb53dfda648ff7e6c802f9ec758049f6eb2 /app/controllers/settings | |
parent | 1f94f4009e5b072f8b508b1bf1a046ea034de7c1 (diff) | |
parent | c225ac8b9eebf4cc3f32bf3f204f7a5256d93d38 (diff) |
Merge pull request #1347 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings')
0 files changed, 0 insertions, 0 deletions