Henry 8dec825c2d Merge branch 'main' into feature/OpenAI-Function ... # Conflicts: # packages/server/marketplaces/chatflows/API Agent OpenAI.json # packages/server/marketplaces/chatflows/Conversational Retrieval Agent.json # packages/server/marketplaces/chatflows/OpenAI Agent.json		2023-11-29 00:26:36 +00:00
..
ConversationalRetrievalAgent.ts	Merge branch 'main' into feature/OpenAI-Function	2023-11-29 00:26:36 +00:00
agent.svg	add conversational retrieval agent	2023-08-06 19:45:21 +01:00