Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 11 Projects Releases Packages Wiki Activity Actions

merge master

Browse source
This commit is contained in:
Christian Schabesberger 2017-11-05 21:00:05 +01:00
parent 763b3bcbc4
commit e650374c14
1 changed files with 0 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/build.gradle
View file

@ -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