Michael Telatynski 9c25aab509 Fix bad merge (3993 before 4021 broke things) ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>		2017-05-29 22:12:36 +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	Add config for riot-bot on desktop app build	2017-05-18 12:00:02 +01:00
src	Fix bad merge (3993 before 4021 broke things)	2017-05-29 22:12:36 +01:00
package.json	auto-launch support, ux =checkbox in UserSettings[Electron]	2017-05-24 15:52:08 +01:00