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
..
build	Updated install spinner referenced in #8913	2019-02-28 11:19:00 +01:00
img	Update Electron's runtime PNG icon to match others	2019-06-18 16:59:04 +01:00
riot.im	Remove reactions feature flag from docs and config	2019-07-18 14:24:00 +01:00
src	Merge branch 'develop' into anoa/jitsi_ptt	2019-07-12 16:57:01 +01:00
package.json	Merge branch 'develop' into anoa/jitsi_ptt	2019-07-19 10:10:18 +01:00
yarn.lock	Update electron version and add compiling docs	2019-04-08 18:16:55 +01:00