diff options
author | ThibG <thib@sitedethib.com> | 2020-08-02 16:05:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-02 16:05:01 +0200 |
commit | 141ac8db8b98230188b13f1da801611bcdc6a9f1 (patch) | |
tree | fbfbc1daae45e7b4cdf8c0525b646a39ba29af96 /app/controllers/settings | |
parent | b12117c4a375b906673a5b67506475a8e78ad6ef (diff) | |
parent | de7ba22c458c3eb9d0edf0c4c25250870c8a60d5 (diff) |
Merge pull request #1392 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings')
0 files changed, 0 insertions, 0 deletions