diff options
author | ThibG <thib@sitedethib.com> | 2020-12-23 14:33:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-23 14:33:47 +0100 |
commit | 225c934a1b66e2fcbedbda7936666c1ca3c9a04b (patch) | |
tree | d71a57d5f5b6bd864ec11cc1c914a6c3b30ba612 /app/controllers/settings | |
parent | 81f4c550b2ed305f39f344d10289b38625f70bf7 (diff) | |
parent | 537afa00f35dbaa98cbff284683317b411104a82 (diff) |
Merge pull request #1481 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings')
0 files changed, 0 insertions, 0 deletions