Andrew Morgan f4a7f0dedd Fix some merge conflicts and up to electron 4.2.6

2019-07-12 17:39:31 +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

Fix some merge conflicts and up to electron 4.2.6

2019-07-12 17:39:31 +01:00

yarn.lock

Update electron version and add compiling docs

2019-04-08 18:16:55 +01:00