• Viktor De Pasquale's avatar
    Merge remote-tracking branch 'john/master' into feature/redesign · 6ccbc272
    Viktor De Pasquale authored
    # Conflicts:
    #	app/build.gradle
    #	app/src/main/AndroidManifest.xml
    #	app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt
    #	app/src/main/java/com/topjohnwu/magisk/model/navigation/MagiskNavigationEvent.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/view/MagiskDialog.kt
    #	app/src/main/res/layout/dialog_magisk_base.xml
    6ccbc272
DataBindingAdapters.kt 9.46 KB