Merge branch 'Develop'

# Conflicts:
#	cps/config_sql.py
This commit is contained in:
Ozzie Isaacs 2024-02-10 10:55:02 +01:00
commit 4864254e37

View File

@ -546,7 +546,6 @@ def load_configuration(session, secret_key):
session.commit() session.commit()
def get_flask_session_key(_session): def get_flask_session_key(_session):
flask_settings = _session.query(_Flask_Settings).one_or_none() flask_settings = _session.query(_Flask_Settings).one_or_none()
if flask_settings == None: if flask_settings == None: