TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-26 11:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
f11bb609c9
Magisk/app/src/main/java/com/topjohnwu
History
Viktor De Pasquale f11bb609c9 Merge remote-tracking branch 'john/master' into feature/redesign 
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/topjohnwu/magisk/ClassMap.kt
#	app/src/main/java/com/topjohnwu/magisk/Info.kt
#	app/src/main/java/com/topjohnwu/magisk/extensions/XAndroid.kt
#	app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt
#	app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
#	app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
2019-10-29 15:53:53 +01:00
..
magisk Merge remote-tracking branch 'john/master' into feature/redesign 2019-10-29 15:53:53 +01:00