Kevin Turner 63532226a5 Merge remote-tracking branch 'origin/main' into dev/diffusers ... # Conflicts: # backend/invoke_ai_web_server.py # ldm/generate.py # ldm/invoke/CLI.py # ldm/invoke/generator/base.py # ldm/invoke/generator/txt2img.py # ldm/models/diffusion/cross_attention_control.py # ldm/modules/attention.py		2022-12-10 08:43:37 -08:00
..
diffusion	Merge remote-tracking branch 'origin/main' into dev/diffusers	2022-12-10 08:43:37 -08:00
__init__.py	Merge dev into main for 2.2.0 (#1642)	2022-11-30 16:12:23 -05:00
autoencoder.py	start support for 1.5 inpainting model, not complete	2022-10-25 00:30:48 -04:00