Viktor De Pasquale f11bb609c9 Merge remote-tracking branch 'john/master' into feature/redesign ... # 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		2019-10-29 15:53:53 +01:00
..
dialogs	Replace general resources with platform	2019-10-26 19:23:57 -04:00
MagiskDialog.kt	Added most of the remaining functionality for Magisk install dialog	2019-10-21 19:22:16 +02:00
MarkDownWindow.kt	Replace general resources with platform	2019-10-26 19:23:57 -04:00
Notifications.kt	Move things around	2019-10-24 05:21:42 -04:00
Shortcuts.kt	Move things around	2019-10-24 05:21:42 -04:00