Andrew Morgan fa72152a96 Merge branch 'develop' into anoa/jitsi_ptt ... * develop: (30 commits) [matrix] -> Matrix Nudge karma to 3.1.2 set chrome path for travis CI explicitly Updated install spinner referenced in #8913 Add support for localConfig at $appData/config.json. Move electron-config to $appData/electron-config.json Translated using Weblate (Hungarian) Update to electron 4.0.6 Translated using Weblate (Spanish) Translated using Weblate (Norwegian Bokmål) Translated using Weblate (Hungarian) Translated using Weblate (Hindi) Translated using Weblate (Greek) Translated using Weblate (German) Translated using Weblate (Finnish) Translated using Weblate (Arabic) Translated using Weblate (Portuguese (Brazil)) Translated using Weblate (Czech) Translated using Weblate (Swedish) Translated using Weblate (Swedish) Allow disabling update mechanism ...		2019-03-03 00:33:02 +00:00
..
build	Updated install spinner referenced in #8913	2019-02-28 11:19:00 +01:00
img	Updated app icons	2019-02-13 17:58:57 +00:00
riot.im	Phased rollout of lazyloading	2018-10-16 10:43:15 +01:00
src	Merge branch 'develop' into anoa/jitsi_ptt	2019-03-03 00:33:02 +00:00
package.json	Merge branch 'develop' into anoa/jitsi_ptt	2019-03-03 00:33:02 +00:00