• 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
..
activity_flash.xml Loading commit data...
activity_main.xml Loading commit data...
activity_main_content.xml Loading commit data...
activity_main_md2.xml Loading commit data...
activity_request.xml Loading commit data...
activity_request_md2.xml Loading commit data...
alert_dialog.xml Loading commit data...
custom_channel_dialog.xml Loading commit data...
custom_download_dialog.xml Loading commit data...
dialog_custom_name.xml Loading commit data...
dialog_magisk_base.xml Loading commit data...
fragment_flash_md2.xml Loading commit data...
fragment_hide_md2.xml Loading commit data...
fragment_home_md2.xml Loading commit data...
fragment_install_md2.xml Loading commit data...
fragment_log.xml Loading commit data...
fragment_log_md2.xml Loading commit data...
fragment_magisk.xml Loading commit data...
fragment_magisk_hide.xml Loading commit data...
fragment_module_md2.xml Loading commit data...
fragment_modules.xml Loading commit data...
fragment_repos.xml Loading commit data...
fragment_safetynet_md2.xml Loading commit data...
fragment_settings_md2.xml Loading commit data...
fragment_superuser.xml Loading commit data...
fragment_superuser_md2.xml Loading commit data...
fragment_theme_md2.xml Loading commit data...
include_hide_filter.xml Loading commit data...
include_install_options.xml Loading commit data...
include_log_magisk.xml Loading commit data...
include_module_filter.xml Loading commit data...
include_update_card.xml Loading commit data...
item_console.xml Loading commit data...
item_developer.xml Loading commit data...
item_developer_link.xml Loading commit data...
item_hide_app.xml Loading commit data...
item_hide_md2.xml Loading commit data...
item_hide_process.xml Loading commit data...
item_hide_process_md2.xml Loading commit data...
item_log_access_md2.xml Loading commit data...
item_log_track_md2.xml Loading commit data...
item_module.xml Loading commit data...
item_module_download.xml Loading commit data...
item_module_md2.xml Loading commit data...
item_page_log.xml Loading commit data...
item_page_magisk_log.xml Loading commit data...
item_policy.xml Loading commit data...
item_policy_md2.xml Loading commit data...
item_repo.xml Loading commit data...
item_repo_md2.xml Loading commit data...
item_safe_mode_notice.xml Loading commit data...
item_section.xml Loading commit data...
item_section_md2.xml Loading commit data...
item_spinner.xml Loading commit data...
item_superuser_log.xml Loading commit data...
item_superuser_log_entry.xml Loading commit data...
markdown_window.xml Loading commit data...
markdown_window_md2.xml Loading commit data...
swicher_caption_variant.xml Loading commit data...