Commit Graph

2 Commits

Author SHA1 Message Date
4b73699750 Added ids to important elements 2016-08-06 10:59:20 +02:00
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