Merge remote-tracking branch 'origin/MOB-24-user_notifications' into MOB-24-user_notifications
# Conflicts: # MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/AuthFragment.kt # MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/CanFragment.kt # MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/NFC/Comms.java # MobileAuthApp/app/src/main/res/values-en/strings.xml # MobileAuthApp/app/src/main/res/values-et/strings.xml # MobileAuthApp/app/src/main/res/values/strings.xml
This commit is contained in:
commit
1c7e51d69a