Andrew Morgan 62cfd3ba12 Merge branch 'develop' into anoa/jitsi_ptt ... * develop: (22 commits) v1.3.0 Prepare changelog for v1.3.0 v1.3.0 Upgrade to JS SDK 2.2.0 and React SDK 1.4.0 Remove reactions feature flag from docs and config Remove edits feature flag from docs and config Remove reactions feature flag from docs and config Remove edits feature flag from docs and config cachebust config file requests v1.3.0-rc.3 Prepare changelog for v1.3.0-rc.3 v1.3.0-rc.3 react-sdk rc.3 v1.3.0-rc.2 Prepare changelog for v1.3.0-rc.2 v1.3.0-rc.2 Upgrade to JS SDK 2.2.0-rc.2 and React SDK 1.4.0-rc.2 Convert install-app-deps to subcommand v1.3.0-rc.1 Prepare changelog for v1.3.0-rc.1 ...		2019-07-19 10:10:18 +01:00
..
components	Add `key` to footer links to appease React	2019-03-29 15:58:41 +00:00
i18n/strings	Fix merge	2019-07-15 14:50:52 +01:00
vector	Merge branch 'develop' into anoa/jitsi_ptt	2019-07-19 10:10:18 +01:00
header	move everything not explicitly riot (or status) branded into matrix-react-sdk	2018-04-11 23:49:52 +01:00