mirror of
https://github.com/TeamNewPipe/NewPipe
synced 2024-08-30 13:02:49 +00:00
merge master
This commit is contained in:
parent
71a8361580
commit
c485e7e167
@ -8,13 +8,8 @@ android {
|
|||||||
applicationId "org.schabi.newpipe"
|
applicationId "org.schabi.newpipe"
|
||||||
minSdkVersion 15
|
minSdkVersion 15
|
||||||
targetSdkVersion 26
|
targetSdkVersion 26
|
||||||
<<<<<<< HEAD
|
|
||||||
versionCode 40
|
|
||||||
versionName "0.10.2"
|
|
||||||
=======
|
|
||||||
versionCode 41
|
versionCode 41
|
||||||
versionName "0.11.0"
|
versionName "0.11.0"
|
||||||
>>>>>>> dev
|
|
||||||
|
|
||||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||||
vectorDrawables.useSupportLibrary = true
|
vectorDrawables.useSupportLibrary = true
|
||||||
|
Loading…
Reference in New Issue
Block a user