Jake/odysseus
1
0
Fork 0
mirror of https://github.com/pewdiepie-archdaemon/odysseus.git synced 2026-07-08 11:56:59 +00:00
Code Packages Projects Releases Activity

Merge remote-tracking branch 'origin/dev'

Browse Source 
# Conflicts:
#	routes/contacts_routes.py
This commit is contained in:
pewdiepie-archdaemon
2026-07-07 00:51:34 +00:00
parent 017903de61 35f867c959
commit b5ec40d505
80 changed files with 5885 additions and 2383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app.py
+2 -2
View File
@@ -683,7 +683,7 @@ from routes.research.research_routes import setup_research_routes
app.include_router(setup_research_routes(research_handler, session_manager=session_manager))
# History
from routes.history_routes import setup_history_routes
from routes.history.history_routes import setup_history_routes
app.include_router(setup_history_routes(session_manager))
# Search
@@ -851,7 +851,7 @@ from routes.vault_routes import setup_vault_routes
app.include_router(setup_vault_routes())
# Contacts (CardDAV)
from routes.contacts_routes import setup_contacts_routes
from routes.contacts.contacts_routes import setup_contacts_routes
app.include_router(setup_contacts_routes())
from companion import setup_companion_routes