Merge branch 'master' into 'develop'

Merge back release

See merge request sschueller/peertube!22

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)
 
 

VERSION.txt

@@ -1 +1 @@
-1.2.0
+1.3.0

app/build.gradle

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

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