 Manuel Schmid
|
5a75599c63
|
Merge branch 'main_upstream' into hotfix/rename-preview-images
# Conflicts:
# sdxl_styles/samples/academia.jpg
# sdxl_styles/samples/baroque.jpg
# sdxl_styles/samples/caricature.jpg
# sdxl_styles/samples/constructivism.jpg
# sdxl_styles/samples/cubism.jpg
# sdxl_styles/samples/dadaism.jpg
# sdxl_styles/samples/expressionism.jpg
# sdxl_styles/samples/fauvism.jpg
# sdxl_styles/samples/futurism.jpg
# sdxl_styles/samples/glitchcore.jpg
# sdxl_styles/samples/idyllic.jpg
# sdxl_styles/samples/impressionism.jpg
# sdxl_styles/samples/medievalism.jpg
# sdxl_styles/samples/minimalism.jpg
# sdxl_styles/samples/neoclassicism.jpg
# sdxl_styles/samples/rococo.jpg
# sdxl_styles/samples/sketchup.jpg
# sdxl_styles/samples/suprematism.jpg
# sdxl_styles/samples/surrealism.jpg
# sdxl_styles/samples/terragen.jpg
|
2024-01-09 14:07:06 +01:00 |
|