Merge branch 'dev'

AUTOMATIC1111 · AUTOMATIC1111 · commit feee37d75f1b · 2024-05-28T21:20:40.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.9.4
+
+### Bug Fixes:
+*  pin setuptools version to fix the startup error ([#15883](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/15883)) 
+
 ## 1.9.3
 
 ### Bug Fixes:
diff --git a/requirements_versions.txt b/requirements_versions.txt
@@ -1,3 +1,4 @@
+setuptools==69.5.1  # temp fix for compatibility with some old packages
 GitPython==3.1.32
 Pillow==9.5.0
 accelerate==0.21.0

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+setuptools==69.5.1 # temp fix for compatibility with some old packages`
`1`	`2`	`GitPython==3.1.32`
`2`	`3`	`Pillow==9.5.0`
`3`	`4`	`accelerate==0.21.0`