about summary refs log tree commit diff
path: root/app/javascript/core/settings.js
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-08-02 11:57:52 +0200
committerGitHub <noreply@github.com>2018-08-02 11:57:52 +0200
commitcf0f8eb742f1e5a7b0bbab261214ee5e9b9de6fe (patch)
tree29c156a7d145f2ec88e4bb708d329202598bdf35 /app/javascript/core/settings.js
parent71b318dedc5f39382cb15250417429427a69166b (diff)
parentbf1d3ae3b83726816c78ca6cb40af24d48390bd9 (diff)
Merge pull request #621 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/core/settings.js')
0 files changed, 0 insertions, 0 deletions