Commit Graph

3 Commits

Author SHA1 Message Date
Joachim Lusiardi d132dc72de Add Entitiy for the Service Object 2016-11-01 11:17:54 +01:00
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
Joachim Lusiardi 738bcb9f89 Fixed project structure for pycharm 2016-07-03 19:29:30 +02:00