Commit Graph

2 Commits

Author SHA1 Message Date
2e0fc3b772 Merge branch 'master' into user_handling
Conflicts:
	app/main.py
	app/requirements.txt
2016-04-18 21:43:01 +02:00
a9b2781ae3 custom login form added 2016-04-17 09:34:11 +02:00