diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-07-02 13:56:02 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-02 13:56:02 +0200 |
commit | 9d127e15ffc337b6f0d5909c76f4771feeb0c978 (patch) | |
tree | 0d859f30a1eeb51ba66e5ac2c7572a6bdb6d4bc0 /config/settings.yml | |
parent | 665eb1affe7ba765af476e6f00096aad3af70735 (diff) | |
parent | 7f1143a40d450bd89cbe9825dfdd6b0c93274dd4 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'config/settings.yml')
0 files changed, 0 insertions, 0 deletions