Commit graph

2 commits

Author SHA1 Message Date
Maxim De Clercq aab522eef9
Merge branch 'master' into feature/microsoft-auth
# Conflicts:
#	app/app.py
#	app/create_database.py
#	app/models/user.py
#	requirements.in
#	requirements.txt
2023-04-19 20:55:35 +02:00
mcbloch cc0c271a22 Add working microsoft login flow 2022-04-20 01:27:52 +02:00
Renamed from app/zeus.py (Browse further)