Merge branch 'master' into origin/master
0b22cf6f143f
Actions

Authored by Antoine on Oct 5 2018, 17:29.

Description

Merge branch 'master' into origin/master

Committed

Antoine

Oct 5 2018, 17:29

Pushed

amasson84

Oct 5 2018, 17:30

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
6a213fbefb7a	Antoine	Merge branch 'addexport'	Oct 5 2018
ed4175b512a5	Antoine	Export final before merging	Oct 5 2018
00ee384a6614	Antoine	Final Beta version with export	Oct 4 2018
eddf6f36cc06	Antoine	start work on export	Oct 1 2018

				Path
	M			.idea/costcalc.iml
	M			.idea/deployment.xml
	A			.idea/jsLibraryMappings.xml
	M			.idea/workspace.xml
	M			css/costcalc.css
	A			index-dev.html
	M			index.html
	D			js/costcal_export.js
	A			js/costcalc_export.jsx
	V			js/{costcalc_main.js → costcalc_main.jsx}
	V			js/{costcalc_main.jsx ← costcalc_main.js}