Joachim Lusiardi 729fee51e9 Merge branch 'user_handling' into add_vehicles ...

Conflicts:
	app/main.py

2016-04-21 21:52:58 +02:00

..

security

more user handling features of flask-security activated

2016-04-21 08:11:57 +02:00

account.html

more user handling features of flask-security activated

2016-04-21 08:11:57 +02:00

admin.html

more user handling features of flask-security activated

2016-04-21 08:11:57 +02:00

layout.html

more user handling features of flask-security activated

2016-04-21 08:11:57 +02:00

manual.html

Reduce services feature and reformatting

2016-04-14 07:32:06 +02:00

newPitStopForm.html

first iteration of vehicles

2016-04-19 06:47:10 +02:00

pitstops.html

Reduce services feature and reformatting

2016-04-14 07:32:06 +02:00

statistics.html

Reduce services feature and reformatting

2016-04-14 07:32:06 +02:00