Commit graph

256 commits

Author SHA1 Message Date
Igor Gassmann
9a786f7d48 Merge remote-tracking branch 'refs/remotes/origin/master'
Conflicts:
	src/main/main.js
2017-12-08 14:37:06 -03:00
Igor Gassmann
87d294a151 Merge branch 'master' into restructuring 2017-12-07 14:10:43 -03:00
Igor Gassmann
eaa5c212d2 Merge branch 'master' into restructuring 2017-12-07 12:24:00 -03:00
Igor Gassmann
dbb28dd625 Fix electron-webpack related errors 2017-12-07 09:52:22 -03:00
Igor Gassmann
df01c361df Fix __static paths for production. Paths aren't correctly resolved on development 2017-12-06 18:21:57 -03:00
Igor Gassmann
6e282ee88f Move .js files into root of renderer dir 2017-12-04 17:12:59 -03:00