diff options
| author | Liam <liamthekerr@gmail.com> | 2022-09-27 20:37:24 +0000 |
|---|---|---|
| committer | Liam <liamthekerr@gmail.com> | 2022-09-27 20:37:24 +0000 |
| commit | 981fe9c4a3994bb42ea5ff5212e4fe53b748bdd9 (patch) | |
| tree | 80fd53962ccafeb773b2d43b178e1ee39ac03ca3 /webui.py | |
| parent | 5034f7d7597685aaa4779296983be0f49f4f991f (diff) | |
| parent | f2a4a2c3a672e22f088a7455d6039557370dd3f2 (diff) | |
| download | stable-diffusion-webui-gfx803-981fe9c4a3994bb42ea5ff5212e4fe53b748bdd9.tar.gz stable-diffusion-webui-gfx803-981fe9c4a3994bb42ea5ff5212e4fe53b748bdd9.tar.bz2 stable-diffusion-webui-gfx803-981fe9c4a3994bb42ea5ff5212e4fe53b748bdd9.zip | |
Merge remote-tracking branch 'upstream/master' into token_count
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(
|