Jia Hao 9b3fd029c1 Merge branch 'feature/window-state-manager' of https://github.com/zweicoder/nativefier into zweicoder-feature/window-state-manager ... # Conflicts: # app/src/components/mainWindow/mainWindow.js # app/src/main.js		2016-01-23 16:29:36 +08:00
..
components	Merge branch 'feature/window-state-manager' of https://github.com/zweicoder/nativefier into zweicoder-feature/window-state-manager	2016-01-23 16:29:36 +08:00
helpers	Refactor main.js into separate files, and put static files such as preload and login.html into app/src/static	2016-01-23 10:09:47 +08:00
static	Merge branch 'refactor/splitcomponents'	2016-01-23 13:43:33 +08:00
main.js	Merge branch 'feature/window-state-manager' of https://github.com/zweicoder/nativefier into zweicoder-feature/window-state-manager	2016-01-23 16:29:36 +08:00