diff options
| author | ThibG <thib@sitedethib.com> | 2020-04-15 18:24:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-15 18:24:41 +0200 |
| commit | 5fdd5eef5a6b05b072a57e065954fdcb0b4a8898 (patch) | |
| tree | d8f035139c20e59c39bb35a74686783094c297da /app/javascript/core/settings.js | |
| parent | 615073df33b9a4317ac5c93fdef83c9cd34567fa (diff) | |
| parent | 66ad30db489ddb2b3ecc98d284aabd47c9d4ae84 (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