about summary refs log tree commit diff
path: root/app/controllers/settings
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-05-16 23:10:12 +0200
committerGitHub <noreply@github.com>2018-05-16 23:10:12 +0200
commit4bf43e6f3e93643d989a2872763b41505fab2206 (patch)
treee1b781fe4fae9d02284e5e836338cc598431413f /app/controllers/settings
parent80aad16e1035a72fec1af56aaac458a35e1f02c5 (diff)
parent78ac246b877072bb5f94da34d29612fafde3a8ae (diff)
Merge pull request #486 from ThibG/glitch-soc/merge-upstream
Merge changes from upstream
Diffstat (limited to 'app/controllers/settings')
0 files changed, 0 insertions, 0 deletions