mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge branch 'develop' into new-guest-access

Browse source
This commit is contained in:
Matthew Hodgson 2017-05-30 21:06:45 +01:00
commit d264426ece
25 changed files with 191 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config.sample.json
View file

@ -11,5 +11,9 @@
"matrix.org"
]
},
"welcomeUserId": "@riot-bot:matrix.org"
"welcomeUserId": "@riot-bot:matrix.org",
"piwik": {
"url": "https://piwik.riot.im/",
"siteId": 1
}
}