Claude df87359ecf Merge remote-tracking branch 'origin/main' into claude/wonderful-cray-r70qk8 ...

# Conflicts:
#	.claude/skills/android-expert/references/proguard-rules.md
#	.claude/skills/kotlin-multiplatform/SKILL.md
#	AGENTS.md
#	amethyst/proguard-rules.pro
#	amethyst/src/main/java/com/vitorpamplona/amethyst/napplet/SignerConsentDetails.kt
#	amethyst/src/test/java/com/vitorpamplona/amethyst/service/okhttp/BlossomReadAuthTokenProviderTest.kt
#	benchmark/src/androidTest/java/com/vitorpamplona/quartz/benchmark/BaseLargeCacheBenchmark.kt
#	benchmark/src/androidTest/java/com/vitorpamplona/quartz/benchmark/CacheBenchmark.kt
#	benchmark/src/androidTest/java/com/vitorpamplona/quartz/benchmark/EventCmdSerializerBenchmark.kt
#	commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/relayClient/diagnostics/RelayFrameDecoder.kt
#	commons/src/jvmAndroid/kotlin/com/vitorpamplona/amethyst/commons/relayClient/diagnostics/KiteDiagnostics.jvmAndroid.kt
#	commons/src/jvmTest/kotlin/com/vitorpamplona/amethyst/commons/cordn/CordnMigrationTest.kt
#	commons/src/jvmTest/kotlin/com/vitorpamplona/amethyst/commons/relayClient/diagnostics/KiteDiagnosticDecoderTest.kt
#	gradle/libs.versions.toml
#	nestsClient/src/jvmTest/kotlin/com/vitorpamplona/nestsclient/NestsAuthTest.kt

2026-10-27 22:38:31 +00:00

..

proguard-rules.md

docs: no Jackson anywhere now; drop the desktop's Jackson keep rules

2026-10-27 20:53:22 +00:00

two-processes.md

refactor: Marmot leave, permissions, timeline and edit rules from marmot-kmp

2026-10-25 01:26:36 +00:00