about summary refs log tree commit diff
path: root/app/controllers/settings
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-04-12 17:58:25 +0200
committerGitHub <noreply@github.com>2020-04-12 17:58:25 +0200
commit615073df33b9a4317ac5c93fdef83c9cd34567fa (patch)
tree8bf82214f7e10e6fdff6c331f20b621e35650d60 /app/controllers/settings
parent51bbf0b68dc504c441cb929e4fbf8d8c6e04df42 (diff)
parenta08a2130f0adec653be22b09140f8b502785a13e (diff)
Merge pull request #1316 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings')
0 files changed, 0 insertions, 0 deletions