• Rodrigo Nascimento's avatar
    Merge remote-tracking branch 'szwacz/master' into update-upstream · feff7c27
    Rodrigo Nascimento authored
    # Conflicts:
    #	.gitignore
    #	.travis.yml
    #	LICENSE
    #	README.md
    #	app/app.html
    #	app/background.js
    #	app/images/osx/dmg-icon.icns
    #	app/package.json
    #	app/vendor/electron_boilerplate/window_state.js
    #	appveyor.yml
    #	build/icon.icns
    #	build/icon.ico
    #	build/icons/512x512.png
    #	package.json
    #	resources/linux/app.desktop
    #	resources/osx/Info.plist
    #	resources/windows/installer.nsi
    #	src/hello_world/hello_world.js
    #	tasks/build/build.js
    #	tasks/rebuild_native_modules.js
    #	tasks/release/linux.js
    #	tasks/release/osx.js
    #	tasks/release/windows.js
    #	tasks/start.js
    #	tasks/utils.js
    feff7c27
This project is licensed under the MIT License. Learn more