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
..
login.py	Add working microsoft login flow	2022-04-20 01:27:52 +02:00
microsoft.py	disable printing of user info	2022-04-20 01:28:48 +02:00
zeus.py	Merge branch 'master' into feature/microsoft-auth	2023-04-19 20:55:35 +02:00