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

..

security

Fixed project structure for pycharm

2016-07-03 19:29:30 +02:00

account.html

Merge branch 'issue_5_more_consumable_material' into pycharm

2016-07-16 19:29:25 +02:00

admin.html

Merge branch 'issue_5_more_consumable_material' into pycharm

2016-07-16 19:29:25 +02:00

createConsumableForm.html

Merge branch 'issue_5_more_consumable_material' into pycharm

2016-07-16 19:29:25 +02:00

createPitStopForm.html

Merge branch 'issue_5_more_consumable_material' into pycharm

2016-07-16 19:29:25 +02:00

createVehicleForm.html

Merge branch 'issue_5_more_consumable_material' into pycharm

2016-07-16 19:29:25 +02:00

deleteAccountForm.html

Fixed project structure for pycharm

2016-07-03 19:29:30 +02:00

deleteConsumableForm.html

Merge branch 'issue_5_more_consumable_material' into pycharm

2016-07-16 19:29:25 +02:00

deletePitstopForm.html

Fixed project structure for pycharm

2016-07-03 19:29:30 +02:00

deleteVehicleForm.html

Fixed project structure for pycharm

2016-07-03 19:29:30 +02:00

editConsumableForm.html

Merge branch 'issue_5_more_consumable_material' into pycharm

2016-07-16 19:29:25 +02:00

editPitStopForm.html

Fixed project structure for pycharm

2016-07-03 19:29:30 +02:00

editVehicleForm.html

Merge branch 'issue_5_more_consumable_material' into pycharm

2016-07-16 19:29:25 +02:00

index.html

Fixed project structure for pycharm

2016-07-03 19:29:30 +02:00

layout.html

Merge branch 'issue_5_more_consumable_material' into pycharm

2016-07-16 19:29:25 +02:00

manual.html

Fixed project structure for pycharm

2016-07-03 19:29:30 +02:00

pitstops.html

Merge branch 'issue_5_more_consumable_material' into pycharm

2016-07-16 19:29:25 +02:00

selectConsumableForVehicle.html

Merge branch 'issue_5_more_consumable_material' into pycharm

2016-07-16 19:29:25 +02:00

selectVehicle.html

Merge branch 'issue_5_more_consumable_material' into pycharm

2016-07-16 19:29:25 +02:00

statistics.html

Merge branch 'issue_5_more_consumable_material' into pycharm

2016-07-16 19:29:25 +02:00