• Viktor De Pasquale's avatar
    Merge remote-tracking branch 'john/master' into development · 605faccf
    Viktor De Pasquale authored
    # Conflicts:
    #	app/build.gradle
    #	app/src/main/java/com/topjohnwu/magisk/App.java
    #	app/src/main/java/com/topjohnwu/magisk/model/adapters/ReposAdapter.java
    #	app/src/main/java/com/topjohnwu/magisk/model/update/UpdateCheckService.java
    #	app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.java
    #	app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.java
    #	app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.java
    #	app/src/main/java/com/topjohnwu/magisk/ui/home/MagiskFragment.java
    #	app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.java
    #	app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.java
    #	app/src/main/java/com/topjohnwu/magisk/utils/ValueSortedMap.java
    #	app/src/main/java/com/topjohnwu/magisk/view/dialogs/InstallMethodDialog.java
    #	app/src/main/java/com/topjohnwu/magisk/view/dialogs/MagiskInstallDialog.java
    #	app/src/main/java/com/topjohnwu/magisk/view/dialogs/ManagerInstallDialog.java
    #	build.gradle
    605faccf
Name
Last commit
Last update
..
data/database Loading commit data...
di Loading commit data...
model Loading commit data...
tasks Loading commit data...
ui Loading commit data...
utils Loading commit data...
view Loading commit data...
App.java Loading commit data...
App.kt Loading commit data...
ClassMap.java Loading commit data...
Config.java Loading commit data...
Const.java Loading commit data...