Go to file
Felix Prahl-Kamps 80b58bc77f Merge branch 'master' into '1-patch-master'
# Conflicts:
#   .idea/assetWizardSettings.xml
#   .idea/modules.xml
#   app/build.gradle
#   app/src/main/AndroidManifest.xml
#   app/src/main/res/layout/activity_main.xml
#   app/src/main/res/values/colors.xml
#   app/src/main/res/values/strings.xml
#   app/src/main/res/values/styles.xml
#   build.gradle
#   gradle.properties
#   gradle/wrapper/gradle-wrapper.properties
2018-04-22 02:00:45 +02:00
.idea Merge branch 'master' into '1-patch-master' 2018-04-22 02:00:45 +02:00
app Merge branch 'master' into '1-patch-master' 2018-04-22 02:00:45 +02:00
gradle/wrapper
.gitignore
build.gradle
gradle.properties
gradlew
gradlew.bat
readme.md
settings.gradle

readme.md

MispAuth

Authentifizierung zweier Misp-Partner über QR-Codes