Merge branch 'develop_upstream' into develop

# Conflicts:
#	fooocus_colab.ipynb
#	fooocus_version.py
#	language/en.json
#	modules/async_worker.py
#	requirements_versions.txt
#	update_log.md
#	webui.py
This commit is contained in:
Manuel Schmid
2024-07-16 19:34:53 +02:00
6 changed files with 41 additions and 30 deletions
+1 -1
View File
@@ -1 +1 @@
version = '2.6.0-rc2 (mashb1t)'
version = '2.6.0-rc3 (mashb1t)'