TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-25 11:05:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
58a449d437
Magisk/app/src/main/java/com/topjohnwu
History
Viktor De Pasquale 58a449d437 Merge branch 'remote-master' into development 
# Conflicts:
#	app/src/main/java/com/topjohnwu/magisk/di/ViewModelsModule.kt
#	app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
#	app/src/main/java/com/topjohnwu/magisk/utils/XString.kt
2019-05-10 16:43:37 +02:00
..
magisk Merge branch 'remote-master' into development 2019-05-10 16:43:37 +02:00