Merge branch 'master' into 'develop'

Master See merge request sschueller/peertube!24
2021-02-21 00:14:53 +01:00 · 2021-02-21 00:14:53 +01:00 · b026068630
parent 5622b760cc b2aa42c52e
commit b026068630
4 changed files with 26 additions and 3 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,15 @@
+# 1.4.0 (2021-02-20)
+
+
+### Bug Fixes
+
+* Crashing of devices sdk 21,22,23,24 on start, fixes [#262](https://git.techdroid.com/sschueller/peertube/issues/262) 5622b76
+
+
+### Features
+
+* add global playback speed setting fa79b2d
+
 # 1.3.0 (2021-02-13)


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

--- a/fastlane/metadata/android/en-US/changelogs/1060.txt
+++ b/fastlane/metadata/android/en-US/changelogs/1060.txt
@ -0,0 +1,11 @@
+# 1.4.0 (2021-02-20)
+
+
+### Bug Fixes
+
+* Crashing of devices sdk 21,22,23,24 on start, fixes [#262](https://git.techdroid.com/sschueller/peertube/issues/262) 5622b76
+
+
+### Features
+
+* add global playback speed setting fa79b2d
 @ -1 +1 @@
 .3.0
 .4.0