Merge branch 'Develop'

# Conflicts: # cps/config_sql.py
3 months ago · 4864254e37
parent 92c162b2fd 09dce28a0e
commit 4864254e37
1 changed files with 0 additions and 1 deletions
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@ -546,7 +546,6 @@ def load_configuration(session, secret_key):
        session.commit()


-
 def get_flask_session_key(_session):
    flask_settings = _session.query(_Flask_Settings).one_or_none()
    if flask_settings == None: