Merge branch 'master' into mautrix-appservice-0.3.0

2018-07-15 00:15:30 +03:00
parent 0f1ac98b9f e16e53c261
commit bfaec2eb81
8 changed files with 122 additions and 38 deletions
@@ -7,4 +7,5 @@ __pycache__

 config.yaml
 registration.yaml
+logs/
 *.db