|  | 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 |  | 
			
				
					|  | 738bcb9f89 | Fixed project structure for pycharm | 2016-07-03 19:29:30 +02:00 |  | 
			
				
					|  | 0d8ae0cd18 | introduces modules | 2016-04-23 23:08:39 +02:00 |  | 
			
				
					|  | 0303be7945 | more user handling features of flask-security activated Now users can recover their passwords and change them while
logged in. | 2016-04-21 08:11:57 +02:00 |  | 
			
				
					|  | 01798e9548 | adds admin page admin users must have role admin (which must currently be set
manually via database) | 2016-04-19 22:41:40 +02:00 |  |