• alex's avatar
    Merge branch 'master' into 'develop-alex' · 7a867662
    alex authored
    # Conflicts:
    #   app/build.gradle
    #   app/src/main/java/com/virjar/majora/adr/KeepAliveService.java
    #   app/src/main/java/com/virjar/majora/adr/MainActivity.java
    #   app/src/main/java/com/virjar/majora/adr/Shell.java
    #   app/src/main/java/com/virjar/majora/adr/TheApp.java
    #   app/src/main/res/layout/activity_main.xml
    7a867662
Name
Last commit
Last update
app Loading commit data...
gradle/wrapper Loading commit data...
script Loading commit data...
.gitignore Loading commit data...
build.gradle Loading commit data...
gradle.properties Loading commit data...
gradlew Loading commit data...
gradlew.bat Loading commit data...
settings.gradle Loading commit data...