Kevin Turner 6f9c1c6d4e Merge remote-tracking branch 'origin/dep/diffusers020' into feat/taesd ... # Conflicts: # invokeai/app/invocations/latent.py		2023-08-18 14:19:27 -07:00
..
api	Resolving merge conflicts for flake8	2023-08-18 15:52:04 +10:00
assets/images	tweaks in response to psychedelicious review of PR	2023-07-26 15:27:04 +10:00
cli	Resolving merge conflicts for flake8	2023-08-18 15:52:04 +10:00
invocations	Merge remote-tracking branch 'origin/dep/diffusers020' into feat/taesd	2023-08-18 14:19:27 -07:00
models	feat(nodes): refactor parameter/primitive nodes	2023-08-16 09:54:38 +10:00
services	Resolving merge conflicts for flake8	2023-08-18 15:52:04 +10:00
util	Resolving merge conflicts for flake8	2023-08-18 15:52:04 +10:00
api_app.py	Resolving merge conflicts for flake8	2023-08-18 15:52:04 +10:00
cli_app.py	Resolving merge conflicts for flake8	2023-08-18 15:52:04 +10:00