Merge branch 'develop' into travis/sourcemaps

This commit is contained in:
Travis Ralston 2020-01-13 11:21:51 -07:00
commit f73d2bae1f
12 changed files with 1041 additions and 880 deletions

View file

@ -22,7 +22,7 @@ import { _t } from 'matrix-react-sdk/src/languageHandler';
const VectorAuthFooter = () => {
const brandingConfig = SdkConfig.get().branding;
let links = [
{"text": "blog", "url": "https://medium.com/@RiotChat"},
{"text": "blog", "url": "https://blog.riot.im"},
{"text": "twitter", "url": "https://twitter.com/@RiotChat"},
{"text": "github", "url": "https://github.com/vector-im/riot-web"},
];