Merge branch 'add_money_conv'
a1c39de5f032
Actions

Authored by Antoine on Feb 19 2019, 09:03.

Description

Merge branch 'add_money_conv'

Committed

Antoine

Feb 19 2019, 09:03

Pushed

amasson84

Feb 19 2019, 09:38

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
52fa7a142a76	Antoine	Final version before merging	Feb 19 2019
b99fbd8ce1c0	Antoine	added currency conversion to user input	Feb 18 2019
d6a43a936ed1	Antoine	Added conv money to export	Feb 18 2019
bfcc1f933374	Antoine	first step	Feb 15 2019

				Path
	M			css/.DS_Store
	M			css/bootstrap-grid.css
	M			css/bootstrap-grid.css.map
	M			css/bootstrap-grid.min.css
	M			css/bootstrap-grid.min.css.map
	M			css/bootstrap-reboot.css
	M			css/bootstrap-reboot.css.map
	M			css/bootstrap-reboot.min.css
	M			css/bootstrap-reboot.min.css.map
	M			css/bootstrap.css
	M			css/bootstrap.css.map
	M			css/bootstrap.min.css
	M			css/bootstrap.min.css.map
	M			css/costcalc.css
	M			index-dev.html
	M			index-pres.html
	M			index.html
	M			js/bootstrap.bundle.js
	M			js/bootstrap.bundle.js.map
	M			js/bootstrap.bundle.min.js
	M			js/bootstrap.bundle.min.js.map
	M			js/bootstrap.js
	M			js/bootstrap.js.map
	M			js/bootstrap.min.js
	M			js/bootstrap.min.js.map
	M			js/costcalc_export.jsx
	M			js/costcalc_main.jsx
	A			js/costcalc_money.jsx
	M			js/data.js
	A			js/money.js
	A			js/money.min.js