Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-08-06 19:11:38 +00:00
commit a8ddf528a8

View File

@ -22,7 +22,7 @@ released version of Riot:
1. Enter the URL into your browser and log into Riot! 1. Enter the URL into your browser and log into Riot!
Releases are signed by PGP, and can be checked against the public key Releases are signed by PGP, and can be checked against the public key
at https://riot.im/packages/keys/riot-master.asc at https://riot.im/packages/keys/riot.asc
Note that Chrome does not allow microphone or webcam access for sites served Note that Chrome does not allow microphone or webcam access for sites served
over http (except localhost), so for working VoIP you will need to serve Riot over http (except localhost), so for working VoIP you will need to serve Riot