Peertube
/
Thorium-android-app
mirror of https://github.com/sschueller/peertube-android
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into 'develop' 

Merge release back into develop

See merge request sschueller/peertube!19
This commit is contained in:
Stefan Schüller 2021-02-08 16:58:48 +01:00
parent fd391a3e51 7f2f25a43f
commit 86c54b9f10
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -1,3 +1,10 @@
# 1.2.0 (2021-02-07)
### Features
* Mark live videos in video lists 8518b80
## 1.1.1 (2021-02-05) ## 1.1.1 (2021-02-05)

2
VERSION.txt
View File

@ -1 +1 @@
1.1.1 1.2.0

4
app/build.gradle
View File

@ -44,8 +44,8 @@ android {
applicationId "net.schueller.peertube" applicationId "net.schueller.peertube"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
versionCode 1057 versionCode 1058
versionName "1.1.1" versionName "1.2.0"
buildConfigField "long", "BUILD_TIME", readPropertyWithDefault('buildTimestamp', System.currentTimeMillis()) + 'L' buildConfigField "long", "BUILD_TIME", readPropertyWithDefault('buildTimestamp', System.currentTimeMillis()) + 'L'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

6
fastlane/metadata/android/en-US/changelogs/1058.txt Normal file
View File

@ -0,0 +1,6 @@
# 1.2.0 (2021-02-07)
### Features
* Mark live videos in video lists 8518b80