This repository has been archived on 2026-07-21. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Marko (Hermes Implementer) edac7cb08a Merge branch 'main' into feature/customizable-mobile-reading-experience ...

Resolve merge conflicts:
- backend/apps/books/: Keep main's models (EBook, BookChapter, etc.)
- frontend/src/App.tsx: Keep /read/:id route + main's all routes
- web/ files: Accept deletion (content ported to frontend/)

2026-05-29 05:59:10 +00:00

..

django.py

Merge branch 'main' into feature/customizable-mobile-reading-experience

2026-05-29 05:59:10 +00:00

settings.py

feat: bookmarks and notes management

2026-05-26 00:50:06 +00:00

urls.py

feat: customizable mobile reading experience

2026-05-29 02:55:36 +00:00

wsgi.py

feat: bookmarks and notes management

2026-05-26 00:50:06 +00:00