Merge branch 'main_upstream' into feature/add-nsfw-filter

# Conflicts:
#	modules/advanced_parameters.py
#	modules/async_worker.py
#	modules/config.py
#	webui.py
This commit is contained in:
Manuel Schmid
2024-05-17 23:10:12 +02:00
57 changed files with 2566 additions and 734 deletions
+1
View File
@@ -52,3 +52,4 @@ user_path_config-deprecated.txt
/package-lock.json
/.coverage*
/auth.json
.DS_Store