Michael Telatynski 0788826a71 Merge branches 'develop' and 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # electron_app/src/tray.js		2017-06-22 15:04:33 +01:00
..
electron-main.js	add missing semicolon	2017-06-20 14:05:17 +01:00
squirrelhooks.js	tidy electron files, they were starting to annoy me	2017-05-22 19:21:52 +01:00
tray.js	Merge branches 'develop' and 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff	2017-06-22 15:04:33 +01:00
updater.js	store window ref globally so when splitting files its easier to access.	2017-06-12 13:50:45 +01:00
vectormenu.js	/me forgets we don't have babel	2017-05-22 19:25:56 +01:00
webcontents-handler.js	we don't really need a webContents like that, so pass if needed	2017-05-25 12:47:36 +01:00