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
..
src/main	Merge remote-tracking branch 'john/master' into feature/redesign	2019-10-29 15:53:53 +01: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-29 15:53:53 +01:00
proguard-kotlin.pro	Removed test options from proguard	2019-05-24 16:02:47 +02:00
proguard-rules.pro	Make sure our constructor is preserved	2019-10-23 07:51:32 -04:00
res-ids.txt	Make main app fully independent from the stub	2019-10-17 02:55:42 -04:00