• Viktor De Pasquale's avatar
    Merge remote-tracking branch 'john/master' into development · 605faccf
    Viktor De Pasquale authored
    # Conflicts:
    #	app/build.gradle
    #	app/src/main/java/com/topjohnwu/magisk/App.java
    #	app/src/main/java/com/topjohnwu/magisk/model/adapters/ReposAdapter.java
    #	app/src/main/java/com/topjohnwu/magisk/model/update/UpdateCheckService.java
    #	app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.java
    #	app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.java
    #	app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.java
    #	app/src/main/java/com/topjohnwu/magisk/ui/home/MagiskFragment.java
    #	app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.java
    #	app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.java
    #	app/src/main/java/com/topjohnwu/magisk/utils/ValueSortedMap.java
    #	app/src/main/java/com/topjohnwu/magisk/view/dialogs/InstallMethodDialog.java
    #	app/src/main/java/com/topjohnwu/magisk/view/dialogs/MagiskInstallDialog.java
    #	app/src/main/java/com/topjohnwu/magisk/view/dialogs/ManagerInstallDialog.java
    #	build.gradle
    605faccf
Name
Last commit
Last update
app Loading commit data...
chromeos Loading commit data...
docs Loading commit data...
gradle/wrapper Loading commit data...
native Loading commit data...
net Loading commit data...
scripts Loading commit data...
shared Loading commit data...
signing Loading commit data...
snet Loading commit data...
stub Loading commit data...
.gitattributes Loading commit data...
.gitignore Loading commit data...
.gitmodules Loading commit data...
LICENSE Loading commit data...
README.MD Loading commit data...
build.gradle Loading commit data...
build.py Loading commit data...
config.prop.sample Loading commit data...
gradle.properties Loading commit data...
gradlew Loading commit data...
gradlew.bat Loading commit data...
settings.gradle Loading commit data...