David Baker 8b65b96adf Merge branch 'master' into develop		2017-06-22 12:08:14 +01:00
..
build	npm is "smart" enough to try and install our electron wrapper as a module	2017-05-10 13:36:27 +01:00
img	npm is "smart" enough to try and install our electron wrapper as a module	2017-05-10 13:36:27 +01:00
riot.im	explicit protocol in configs, otherwise breaks in Electron	2017-05-29 19:32:44 +01:00
src	explicit convert to nativeImage to stabilise on Windows	2017-06-19 11:58:44 +01:00
package.json	v0.11.4	2017-06-22 12:01:05 +01:00