• 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
..
drawable Loading commit data...
drawable-v24 Loading commit data...
layout Loading commit data...
mipmap-anydpi-v26 Loading commit data...
mipmap-hdpi Loading commit data...
mipmap-mdpi Loading commit data...
mipmap-xhdpi Loading commit data...
mipmap-xxhdpi Loading commit data...
mipmap-xxxhdpi Loading commit data...
values Loading commit data...
xml Loading commit data...