stargateprovider 7e14bc289e Merge remote-tracking branch 'origin/Tests' into Tests ... # Conflicts: # MobileAuthApp/app/src/androidTest/java/com/tarkvaraprojekt/mobileauthapp/UC4Test.kt # MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/AuthFragment.kt # 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		2021-12-07 00:34:51 +02:00
..
src	Merge remote-tracking branch 'origin/Tests' into Tests	2021-12-07 00:34:51 +02:00
.gitignore	MOB-9 set up base android project	2021-09-24 20:07:39 +03:00
build.gradle	UC4 test	2021-12-07 00:01:42 +02:00
proguard-rules.pro	MOB-9 set up base android project	2021-09-24 20:07:39 +03:00