nrobi144 d08aed47e8 Merge upstream/main into nrobi144/phase-2A ...

Resolved import conflicts caused by package reorganization:
- upstream moved classes to amethyst/service/relayClient/*
- upstream moved models to commons/model/*
- kept our desktop additions (zaps, bookmarks, search)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

2026-01-21 06:04:13 +02:00

..

src

Merge upstream/main into nrobi144/phase-2A

2026-01-21 06:04:13 +02:00

.gitignore

…

build.gradle.kts

feat: Add lifecycle-viewmodel KMP dependencies to commons

2026-01-09 07:01:36 +02:00

consumer-rules.pro

…

proguard-rules.pro

Moves test assets to resources to make it work with kmp

2025-08-27 21:09:21 -04:00