about summary refs log tree commit diff
path: root/app/controllers/settings
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-04-01 21:36:36 +0200
committerGitHub <noreply@github.com>2019-04-01 21:36:36 +0200
commit3f5acc1ab3bc9c5a6c5805901a393ccd3457b909 (patch)
tree4ddadcc66d07a1edfcfb9ff0f9cda7cf107d6b46 /app/controllers/settings
parent925830d11bb5c132e282f82bdb2ca893d87c9c24 (diff)
parent12dae9d58316bec32adaac016998ab1cf69d2b45 (diff)
Merge pull request #978 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings')
0 files changed, 0 insertions, 0 deletions