• Viktor De Pasquale's avatar
    Merge remote-tracking branch 'john/master' into feature/redesign · f11bb609
    Viktor De Pasquale authored
    # Conflicts:
    #	app/build.gradle
    #	app/src/main/java/com/topjohnwu/magisk/ClassMap.kt
    #	app/src/main/java/com/topjohnwu/magisk/Info.kt
    #	app/src/main/java/com/topjohnwu/magisk/extensions/XAndroid.kt
    #	app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt
    #	app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
    #	app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
    f11bb609
Name
Last commit
Last update
..
src/main Loading commit data...
.gitignore Loading commit data...
build.gradle Loading commit data...
proguard-kotlin.pro Loading commit data...
proguard-rules.pro Loading commit data...
res-ids.txt Loading commit data...