Merge branch 'develop_upstream'

# Conflicts:
#	fooocus_version.py
#	modules/util.py
#	tests/test_utils.py
#	webui.py
This commit is contained in:
Manuel Schmid
2024-05-26 15:28:08 +02:00
12 changed files with 98 additions and 25 deletions
+1 -1
View File
@@ -1 +1 @@
version = '2.4.0-rc4 (mashb1t)'
version = '2.4.0 (mashb1t)'