b37e0f25f5
Conflicts: app/src/main/java/me/datenknoten/tueroeffner/MainActivity.java |
||
---|---|---|
.. | ||
src | ||
.gitignore | ||
app-release.apk | ||
app.iml | ||
build.gradle | ||
manifest-merger-release-report.txt | ||
proguard-rules.pro |
b37e0f25f5
Conflicts: app/src/main/java/me/datenknoten/tueroeffner/MainActivity.java |
||
---|---|---|
.. | ||
src | ||
.gitignore | ||
app-release.apk | ||
app.iml | ||
build.gradle | ||
manifest-merger-release-report.txt | ||
proguard-rules.pro |