David Baker 968e21a67d Merge branch 'master' into develop

2017-06-06 17:48:32 +01:00

..

build

…

img

…

riot.im

explicit protocol in configs, otherwise breaks in Electron

2017-05-29 19:32:44 +01:00

src

Merge pull request #4183 from vector-im/t3chguy/electron_logo_windows_weirdness

2017-06-04 22:58:17 +01:00

package.json

Merge branch 'master' into develop

2017-06-06 17:48:32 +01:00