Kevin Turner 88963dbe6e Merge remote-tracking branch 'origin/main' into feat/dev_reload ...

# Conflicts:
#	invokeai/app/api_app.py
#	invokeai/app/services/config.py

2023-08-21 09:04:31 -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

chore: black

2023-08-21 19:17:15 +10:00

models

feat(nodes): refactor parameter/primitive nodes

2023-08-16 09:54:38 +10:00

services

Merge remote-tracking branch 'origin/main' into feat/dev_reload

2023-08-21 09:04:31 -07:00

util

Resolving merge conflicts for flake8

2023-08-18 15:52:04 +10:00

api_app.py

Merge remote-tracking branch 'origin/main' into feat/dev_reload

2023-08-21 09:04:31 -07:00

cli_app.py

Resolving merge conflicts for flake8

2023-08-18 15:52:04 +10:00