• Viktor De Pasquale's avatar
    Merge remote-tracking branch 'john/master' into feature/redesign · 4f0e1c6c
    Viktor De Pasquale authored
    # 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
    4f0e1c6c
Name
Last commit
Last update
..
anim Loading commit data...
color Loading commit data...
drawable Loading commit data...
drawable-anydpi-v21 Loading commit data...
drawable-hdpi Loading commit data...
drawable-mdpi Loading commit data...
drawable-nodpi Loading commit data...
drawable-v21 Loading commit data...
drawable-v26 Loading commit data...
drawable-xhdpi Loading commit data...
drawable-xxhdpi Loading commit data...
drawable-xxxhdpi Loading commit data...
font Loading commit data...
layout Loading commit data...
menu Loading commit data...
raw Loading commit data...
values Loading commit data...
values-ar Loading commit data...
values-az Loading commit data...
values-bg Loading commit data...
values-ca Loading commit data...
values-cs Loading commit data...
values-de Loading commit data...
values-el Loading commit data...
values-es Loading commit data...
values-et Loading commit data...
values-fr Loading commit data...
values-hi Loading commit data...
values-hr Loading commit data...
values-in Loading commit data...
values-it Loading commit data...
values-ja Loading commit data...
values-ko Loading commit data...
values-lt Loading commit data...
values-mk Loading commit data...
values-nb Loading commit data...
values-night Loading commit data...
values-nl Loading commit data...
values-pl Loading commit data...
values-pt-rBR Loading commit data...
values-pt-rPT Loading commit data...
values-ro Loading commit data...
values-ru Loading commit data...
values-sk Loading commit data...
values-sr Loading commit data...
values-sv Loading commit data...
values-sw600dp Loading commit data...
values-th Loading commit data...
values-tr Loading commit data...
values-uk Loading commit data...
values-v19 Loading commit data...
values-v21 Loading commit data...
values-vi Loading commit data...
values-zh-rCN Loading commit data...
values-zh-rTW Loading commit data...
xml Loading commit data...