Viktor De Pasquale 80855e89ec Merge remote-tracking branch 'john/master' into development ...

# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/topjohnwu/magisk/model/receiver/GeneralReceiver.kt
#	app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt
#	app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt

2019-05-13 16:50:08 +02:00

..

src/main

Merge remote-tracking branch 'john/master' into development

2019-05-13 16:50:08 +02:00

.gitignore

…

build.gradle

Update gradle scripts

2019-01-04 17:55:17 +08:00

proguard-rules.pro

…