• 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
..
ClientIdentifier.java Loading commit data...
KeepAliveService.java Loading commit data...
MainActivity.java Loading commit data...
SettingsActivity.java Loading commit data...
Shell.java Loading commit data...
TheApp.java Loading commit data...