merged in main and resolved conflicts

src/spiffworkflow_backend/config/__init__.py

@@ -74,5 +74,9 @@ def setup_config(app: Flask) -> None:
             app.config["SPIFFWORKFLOW_BACKEND_PERMISSIONS_FILE_NAME"],
         )
 
+    # unversioned (see .gitignore) config that can override everything and include secrets.
+    # src/spiffworkflow_backend/config/secrets.py
+    app.config.from_pyfile(os.path.join("config", "secrets.py"), silent=True)
+
     thread_local_data = threading.local()
     app.config["THREAD_LOCAL_DATA"] = thread_local_data