Keerthi Niranjan 0c652be973 Merge remote-tracking branch 'upstream/master' into skynet ... # Conflicts: # js/windowMgr.js # package.json		2017-12-27 14:52:53 +05:30
..
mac	Electron-223 - Update the regexp to validate URLs	2017-12-14 21:46:33 +05:30
win	Merge remote-tracking branch 'upstream/master' into skynet	2017-12-27 14:52:53 +05:30