Merge branch 'master' into fix/unstyled-flash

This commit is contained in:
Juan Cruz Viotti 2015-12-15 10:00:45 -04:00
commit 69935b4ca7

View File

@ -1,6 +1,6 @@
ELECTRON_PACKAGER=./node_modules/.bin/electron-packager
ELECTRON_IGNORE=$(shell cat package.ignore | tr "\\n" "|" | sed "s/.$$//")
ELECTRON_VERSION=0.35.2
ELECTRON_VERSION=0.36.0
release/Herostratus-darwin-x64: .
$(ELECTRON_PACKAGER) . Herostratus \