304 commits

Author	SHA1	Message	Date
Igor Gassmann	1d9a5d90cf	Fix merge conflicts	2017-11-27 21:01:33 -03:00
Igor Gassmann	3032736026	attempt to fix restructuring branch	2017-11-27 18:48:45 -05:00
Jeremy Kauffman	3a0ffb312a	Revert "Update file structure to follow electron-webpack guidelines"	2017-11-24 16:36:10 -05:00
Igor Gassmann	dbf0fae552	Update file structure to follow electron-webpack guidelines	2017-11-24 11:31:05 -03:00