Viktor De Pasquale 605faccffd Merge remote-tracking branch 'john/master' into development ... # 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		2019-04-16 19:40:34 +02:00
..
main	Merge remote-tracking branch 'john/master' into development	2019-04-16 19:40:34 +02:00