mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2024-09-29 08:20:51 +00:00
Merge branch 'main' of https://github.com/vitorpamplona/amethyst
# Conflicts: # amethyst/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/QrCodeDrawer.kt
This commit is contained in:
commit
a95d2e903e