jlusiardi
/
rollerverbrauch
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases 12 Wiki Activity
rollerverbrauch/app
History
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
..
config Fixed project structure for pycharm 2016-07-03 19:29:30 +02:00
static Fixed project structure for pycharm 2016-07-03 19:29:30 +02:00
templates Merge branch 'issue_5_more_consumable_material' into pycharm 2016-07-16 19:29:25 +02:00
__init__.py Merge branch 'issue_5_more_consumable_material' into pycharm 2016-07-16 19:29:25 +02:00
entities.py Merge branch 'issue_5_more_consumable_material' into pycharm 2016-07-16 19:29:25 +02:00
filters.py Fixed project structure for pycharm 2016-07-03 19:29:30 +02:00
forms.py Merge branch 'issue_5_more_consumable_material' into pycharm 2016-07-16 19:29:25 +02:00
tools.py Merge branch 'issue_5_more_consumable_material' into pycharm 2016-07-16 19:29:25 +02:00