stargateprovider 1037d672d5 Merge branch 'main' into MOB-24-user_notifications ... # Conflicts: # MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/AuthFragment.kt # MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/NFC/Comms.java		2021-12-04 19:12:25 +02:00
..
src	Merge branch 'main' into MOB-24-user_notifications	2021-12-04 19:12:25 +02:00
.gitignore	MOB-9 set up base android project	2021-09-24 20:07:39 +03:00
build.gradle	MOB-42 Changed POST request logic	2021-11-08 23:52:38 +02:00
proguard-rules.pro	MOB-9 set up base android project	2021-09-24 20:07:39 +03:00