user1 c5faffc18b Merge branch 'main' of github.com:invoke-ai/InvokeAI into feat/controlnet-control-modes ... Only "real" conflicts were in: invokeai/frontend/web/src/features/controlNet/components/ControlNet.tsx invokeai/frontend/web/src/features/controlNet/store/controlNetSlice.ts		2023-06-24 17:05:57 -07:00
..
api	feat(models): update model manager service & route to return list of models	2023-06-22 17:34:12 +10:00
cli	use InvokeAISettings for app-wide configuration	2023-05-03 22:30:30 -04:00
invocations	Merge branch 'main' of github.com:invoke-ai/InvokeAI into feat/controlnet-control-modes	2023-06-24 17:05:57 -07:00
models	feat(nodes): remove image_origin from most places	2023-06-14 23:08:27 +10:00
services	feat(models): update model manager service & route to return list of models	2023-06-22 17:34:12 +10:00
util	feat(nodes): refactor image types	2023-05-28 20:19:56 -04:00
api_app.py	Set model type to const value in openapi schema, add model format enums to model schema(as they not not referenced in case of Literal definition)	2023-06-22 16:51:53 +10:00
cli_app.py	resolve conflicts	2023-06-10 10:13:54 -04:00