Joachim Lusiardi 729fee51e9 Merge branch 'user_handling' into add_vehicles ... Conflicts: app/main.py		2016-04-21 21:52:58 +02:00
..
config	switched to environment variable for config file lookup	2016-04-19 21:09:15 +02:00
static	next try with icons	2015-03-22 13:31:03 +01:00
templates	Merge branch 'user_handling' into add_vehicles	2016-04-21 21:52:58 +02:00
main.py	Merge branch 'user_handling' into add_vehicles	2016-04-21 21:52:58 +02:00
requirements.txt	Merge branch 'master' into user_handling	2016-04-18 21:43:01 +02:00
schema.sql	Reduce services feature and reformatting	2016-04-14 07:32:06 +02:00