diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-07 04:17:14 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-07 04:17:14 +0000 |
| commit | 744447b3c04d7806e383f0d1ad7a10c73bd667ef (patch) | |
| tree | 640d74c3586dfe3114b7db3fdb97e2e3d8490843 /config/settings.yml | |
| parent | de5620995175b7c1c0fc458bd78c12d8c5860aad (diff) | |
| parent | 0c4ca3e549865623fdd35764915814acc8a595e1 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/settings.yml')
0 files changed, 0 insertions, 0 deletions