Merge branch 'master' into 'develop'

Merge back release See merge request sschueller/peertube!22
2021-02-15 08:10:37 +01:00 · 2021-02-15 08:10:37 +01:00 · b2c3efa02a
commit b2c3efa02a
parent 1c34556116 27f5f4556b
4 changed files with 28 additions and 3 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,16 @@
+# 1.3.0 (2021-02-13)
+
+
+### Bug Fixes
+
+* Converted videolist to Kotlin to fix broken top menu 06ace0d
+
+
+### Features
+
+* Added video thumb placehoder for loading and errors 830b197
+* Converted meta date helper to kotlin 1c34556
+
 # 1.2.0 (2021-02-07)


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

--- a/fastlane/metadata/android/en-US/changelogs/1059.txt
+++ b/fastlane/metadata/android/en-US/changelogs/1059.txt
@ -0,0 +1,12 @@
+# 1.3.0 (2021-02-13)
+
+
+### Bug Fixes
+
+* Converted videolist to Kotlin to fix broken top menu 06ace0d
+
+
+### Features
+
+* Added video thumb placehoder for loading and errors 830b197
+* Converted meta date helper to kotlin 1c34556
 @ -1 +1 @@
 .2.0
 .3.0