diff options
author | ThibG <thib@sitedethib.com> | 2019-02-28 22:02:36 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-28 22:02:36 +0100 |
commit | b969b150e8f095dc91c19c7381923c2c19edb968 (patch) | |
tree | 015d70b4b633fadf70cab9d0a0b0fbd55e6456ae /app/views/settings/preferences | |
parent | 76ed481aa7b67d624675cdaa85bac583853fd24d (diff) | |
parent | 2267eee356a3d2b8ebb20892c5182b6f8169403e (diff) |
Merge pull request #932 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/settings/preferences')
0 files changed, 0 insertions, 0 deletions