Merge branch 'master' into 'develop'

Merge release back into develop See merge request sschueller/peertube!19
2021-02-08 16:58:48 +01:00 · 2021-02-08 16:58:48 +01:00 · 86c54b9f10
parent fd391a3e51 7f2f25a43f
commit 86c54b9f10
4 changed files with 16 additions and 3 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,10 @@
+# 1.2.0 (2021-02-07)
+
+
+### Features
+
+* Mark live videos in video lists 8518b80
+
 ## 1.1.1 (2021-02-05)


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

--- a/fastlane/metadata/android/en-US/changelogs/1058.txt
+++ b/fastlane/metadata/android/en-US/changelogs/1058.txt
@ -0,0 +1,6 @@
+# 1.2.0 (2021-02-07)
+
+
+### Features
+
+* Mark live videos in video lists 8518b80
 @ -1 +1 @@
 .1.1
 .2.0