Merge branch 'main_upstream'

# Conflicts:
#	launch.py
#	ldm_patched/modules/args_parser.py
#	modules/config.py
#	presets/anime.json
#	presets/default.json
#	presets/lcm.json
#	presets/realistic.json
This commit is contained in:
Manuel Schmid
2024-01-27 21:09:08 +01:00
60 changed files with 2049 additions and 275 deletions
+1
View File
@@ -21,6 +21,7 @@ user_path_config-deprecated.txt
/models/safety_checker_models
/modules/*.png
/repositories
/fooocus_env
/venv
/tmp
/ui-config.json