jlusiardi
/
rollerverbrauch
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases 12 Wiki Activity
212 Commits 9 Branches 13 Tags 728 KiB
Commit Graph

1 Commits

Author SHA1 Message Date
Joachim Lusiardi fdb8993ac3 Merge branch 'issue_5_more_consumable_material' into pycharm 
Conflicts:
	app/__init__.py
	app/rollerverbrauch/templates/createPitStopForm.html
	app/rollerverbrauch/templates/newPitStopForm.html
	app/rollerverbrauch/templates/selectVehice.html
	app/rollerverbrauch/templates/selectVehicle.html
	app/templates/newPitStopForm.html
	app/templates/selectVehice.html
 2016-07-16 19:29:25 +02:00