Merge branch 'release/beta-10' into develop

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v1.0.0-beta.10
+
+**See the v1.0.0-beta.10.pre.1 changelog, in particular how to upgrade**
+
+### Bug fixes (from beta.10.pre.3)
+
+ * Fix caption upload on Mac OS
+
+
 ## v1.0.0-beta.10.pre.3
 
 **See the v1.0.0-beta.10.pre.1 changelog, in particular how to upgrade**

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "peertube-client",
-  "version": "1.0.0-beta.10.pre.3",
+  "version": "1.0.0-beta.10",
   "private": true,
   "licence": "GPLv3",
   "author": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "peertube",
   "description": "Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.",
-  "version": "1.0.0-beta.10.pre.3",
+  "version": "1.0.0-beta.10",
   "private": true,
   "licence": "AGPLv3",
   "engines": {