Merge pull request #4210 from axelsimon/patch-1

Replace mentions of Vector with Riot
This commit is contained in:
Richard van der Hoff 2018-12-04 12:08:07 +01:00 committed by GitHub
commit dd27e47b5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -333,7 +333,7 @@ content served to web browsers a matrix API from being able to attack webapps ho
on the same domain. This is particularly true of sharing a matrix webclient and on the same domain. This is particularly true of sharing a matrix webclient and
server on the same domain. server on the same domain.
See https://github.com/vector-im/vector-web/issues/1977 and See https://github.com/vector-im/riot-web/issues/1977 and
https://developer.github.com/changes/2014-04-25-user-content-security for more details. https://developer.github.com/changes/2014-04-25-user-content-security for more details.
@ -828,7 +828,7 @@ Password reset
============== ==============
If a user has registered an email address to their account using an identity If a user has registered an email address to their account using an identity
server, they can request a password-reset token via clients such as Vector. server, they can request a password-reset token via clients such as Riot.
A manual password reset can be done via direct database access as follows. A manual password reset can be done via direct database access as follows.