mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2026-10-06 11:48:24 +00:00
Conflicts: - DisplayPaymentTargets.kt: main's model.User import superseded by the commons User import; setText import dropped (main's rewrite no longer uses it). - strings.xml: kept only main's genuinely new notify_block_relay key; thread_title and send_the_seller_a_message already migrated to commons. Also re-added the R import in NotifyRequestDialog.kt for the new R.string.notify_block_relay usage. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011S1vbFWVVAMFDT8PTgdibV