diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-28 22:35:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-28 22:35:54 +0200 |
| commit | 98c2d2aa46c2725b360907cf5537338ac6d052ed (patch) | |
| tree | 4b3301453fc3f8bcfe412a5e1bb967ec5c3414c6 /app/javascript/flavours/glitch/util/settings.js | |
| parent | f7c0e326ab11a597b17a22dd8889f0690d7ffd73 (diff) | |
| parent | 662252c8f77e8dd8fd015bc6ece0943f068b1710 (diff) | |
Merge pull request #1146 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/util/settings.js')
0 files changed, 0 insertions, 0 deletions