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:
# Conflicts: # amethyst/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/QrCodeDrawer.kt