diff options
| author | d8ahazard <d8ahazard@gmail.com> | 2022-09-27 16:02:41 +0000 |
|---|---|---|
| committer | d8ahazard <d8ahazard@gmail.com> | 2022-09-27 16:02:41 +0000 |
| commit | 5756d517a6342d8a9ffa3ead636dcb84b463d2e3 (patch) | |
| tree | 6feb5e799520b66aa65f09f7dbb352f4e3813a60 /webui.py | |
| parent | 11875f586323cea7c5b8398976449788a83dee76 (diff) | |
| parent | ada901ed661a717c44281d640b8fc0a275d4cb48 (diff) | |
| download | stable-diffusion-webui-gfx803-5756d517a6342d8a9ffa3ead636dcb84b463d2e3.tar.gz stable-diffusion-webui-gfx803-5756d517a6342d8a9ffa3ead636dcb84b463d2e3.tar.bz2 stable-diffusion-webui-gfx803-5756d517a6342d8a9ffa3ead636dcb84b463d2e3.zip | |
Merge remote-tracking branch 'upstream/master' into ModelLoader
Diffstat (limited to 'webui.py')
| -rw-r--r-- | webui.py | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -85,7 +85,8 @@ def webui(): txt2img=wrap_gradio_gpu_call(modules.txt2img.txt2img),
img2img=wrap_gradio_gpu_call(modules.img2img.img2img),
run_extras=wrap_gradio_gpu_call(modules.extras.run_extras),
- run_pnginfo=modules.extras.run_pnginfo
+ run_pnginfo=modules.extras.run_pnginfo,
+ run_modelmerger=modules.extras.run_modelmerger
)
demo.launch(
|