Viktor De Pasquale 6ccbc272c6 Merge remote-tracking branch 'john/master' into feature/redesign ... # 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		2019-10-16 17:33:54 +02:00
..
src/main	Merge remote-tracking branch 'john/master' into feature/redesign	2019-10-16 17:33:54 +02:00
.gitignore	Separate backend logic from frontend UI	2018-12-13 04:35:50 -05:00
build.gradle	Merge remote-tracking branch 'john/master' into feature/redesign	2019-10-16 17:33:54 +02:00
proguard-kotlin.pro	Removed test options from proguard	2019-05-24 16:02:47 +02:00
proguard-rules.pro	Reorganize classes	2019-09-28 03:37:24 -04:00