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
..
a.java	Make a.a not extend AppComponentFactory	2019-11-09 16:13:15 -05:00
b.java	Updated locations of nearly all files	2019-04-11 18:03:23 +02:00
c.java	Updated locations of nearly all files	2019-04-11 18:03:23 +02:00
e.java	Make main app fully independent from the stub	2019-10-17 02:55:42 -04:00
f.java	Updated locations of nearly all files	2019-04-11 18:03:23 +02:00
g.java	Updated locations of nearly all files	2019-04-11 18:03:23 +02:00
h.java	Updated locations of nearly all files	2019-04-11 18:03:23 +02:00
i.kt	Added remaining stubs for the redesign	2019-10-17 18:57:00 +02:00
j.java	Stream and process module zips	2019-07-20 21:04:06 -07:00
m.java	Updated locations of nearly all files	2019-04-11 18:03:23 +02:00
w.java	Don't need to wrap another layer of context	2019-10-26 15:37:12 -04:00