Viktor De Pasquale 4f0e1c6c61 Merge remote-tracking branch 'john/master' into feature/redesign ... # Conflicts: # app/build.gradle # app/src/main/java/com/topjohnwu/magisk/Hacks.kt # app/src/main/java/com/topjohnwu/magisk/data/database/RepoDatabase.kt # app/src/main/java/com/topjohnwu/magisk/data/repository/LogRepository.kt # app/src/main/java/com/topjohnwu/magisk/di/DatabaseModule.kt # app/src/main/java/com/topjohnwu/magisk/extensions/RxJava.kt # app/src/main/java/com/topjohnwu/magisk/extensions/XAndroid.kt # app/src/main/java/com/topjohnwu/magisk/extensions/XJava.kt # app/src/main/java/com/topjohnwu/magisk/model/download/RemoteFileService.kt # app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/LogRvItem.kt # app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt # app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt # app/src/main/res/xml/app_settings.xml		2019-11-21 17:46:59 +01:00
..
src/main	Merge remote-tracking branch 'john/master' into feature/redesign	2019-11-21 17:46:59 +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-11-21 17:46:59 +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