Joachim Lusiardi 2e0fc3b772 Merge branch 'master' into user_handling ... Conflicts: app/main.py app/requirements.txt		2016-04-18 21:43:01 +02:00
..
db/__pycache__	switched to Flask-SQLAlchemy for db handling	2016-04-16 15:48:24 +02:00
static	next try with icons	2015-03-22 13:31:03 +01:00
templates	Merge branch 'master' into user_handling	2016-04-18 21:43:01 +02:00
main.py	Merge branch 'master' into user_handling	2016-04-18 21:43:01 +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