Jia Hao 7bfa42ef71 Merge branch 'development' into feature/flash ...

# Conflicts:
#	README.md
#	src/build/buildApp.js
#	src/cli.js
#	src/options/optionsMain.js

2016-02-23 21:13:20 +08:00

..

src

Merge branch 'development' into feature/flash

2016-02-23 21:13:20 +08:00

nativefier.json

Fix invalid json

2016-01-24 21:17:56 +08:00

package.json

Don't modify the window title

2016-01-30 00:30:25 +08:00