about summary refs log tree commit diff
path: root/app/controllers/settings
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-07-10 17:29:43 +0200
committerGitHub <noreply@github.com>2020-07-10 17:29:43 +0200
commitddf7cc1ab56b888fdf61ee8cb1456c71cd9c33c9 (patch)
treeb2e64f065128f5df5d910d7ea393ebc2575be54b /app/controllers/settings
parentd42a23fdbe59f5a8f2beed4201ccd6d797fbd5f4 (diff)
parent66c0953c33d6d872e720eb8dedc5ab94bb3cd69a (diff)
Merge pull request #1380 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings')
0 files changed, 0 insertions, 0 deletions