Keerthi Niranjan 1bbb1f3ff0 Merge remote-tracking branch 'upstream/skynet' into SEARCH-197 ... # Conflicts: # js/main.js		2017-11-07 15:00:14 +05:30
..
mac	Merge remote-tracking branch 'upstream/skynet' into SEARCH-197	2017-11-07 15:00:14 +05:30
win	Merge pull request #207 from VishwasShashidhar/electron-141	2017-10-31 15:36:30 +05:30