Merge branch 'develop' into new-guest-access

2017-05-28 22:50:53 +01:00
parent 75eca60d76 47d412df73
commit a92d96347b
59 changed files with 2009 additions and 386 deletions
--- a/config.sample.json
+++ b/config.sample.json
@@ -11,5 +11,5 @@
            "matrix.org"
        ]
    },
-    "welcomeUserId": "@RiotBot:matrix.org"
+    "welcomeUserId": "@riot-bot:matrix.org"
 }