about summary refs log tree commit diff
path: root/app/javascript/core/settings.js
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-04-15 18:24:41 +0200
committerGitHub <noreply@github.com>2020-04-15 18:24:41 +0200
commit5fdd5eef5a6b05b072a57e065954fdcb0b4a8898 (patch)
treed8f035139c20e59c39bb35a74686783094c297da /app/javascript/core/settings.js
parent615073df33b9a4317ac5c93fdef83c9cd34567fa (diff)
parent66ad30db489ddb2b3ecc98d284aabd47c9d4ae84 (diff)
Merge pull request #1317 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/core/settings.js')
0 files changed, 0 insertions, 0 deletions