Joachim Lusiardi 2e0fc3b772 Merge branch 'master' into user_handling ...

Conflicts:
	app/main.py
	app/requirements.txt

2016-04-18 21:43:01 +02:00

..

security

Merge branch 'master' into user_handling

2016-04-18 21:43:01 +02:00

layout.html

Merge branch 'master' into user_handling

2016-04-18 21:43:01 +02:00

manual.html

Reduce services feature and reformatting

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

newPitStopForm.html

Merge branch 'master' into user_handling

2016-04-18 21:43:01 +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