TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-24 02:25:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
51e40dd98c
Magisk/net/src/main
History
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
..
java/com/topjohnwu/net Merge remote-tracking branch 'john/master' into development 2019-05-13 16:50:08 +02:00
AndroidManifest.xml Support SDK 17 for stub APK 2018-12-27 14:35:55 +08:00