Andrew Morgan b7781ab503 Merge branch 'develop' into anoa/jitsi_ptt ... * develop: (249 commits) Clarify deployment scripts Add riot.im configuration files Enable reactions and edits for desktop Remove unused disable_identity_server config flag Improve wording in debug log sending in issue templates Require a rageshake description in mxSendRageshake Fetch deps Verify i18n in CI Upgrade dependencies v1.2.4 Prepare changelog for v1.2.4 v1.2.4 Upgrade lodash Upgrade to JS SDK 2.1.1 and React SDK 1.3.1 v1.2.3 Prepare changelog for v1.2.3 v1.2.3 Upgrade to JS SDK 2.1.0 and React SDK 1.3.0 Upgrade dependencies v1.2.3-rc.1 ...		2019-07-12 16:57:01 +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	Add riot.im configuration files	2019-07-12 10:48:34 +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-12 16:57:01 +01:00
yarn.lock	Update electron version and add compiling docs	2019-04-08 18:16:55 +01:00