aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-08-07 16:12:31 +0200
committerChocobozzz <me@florianbigard.com>2018-08-07 16:12:31 +0200
commit9a12f169c15b638fe78cf6e85a1993550a25e404 (patch)
treeee3efd50738036f899e17f56620dccbe2e39739b
parent3d52b300ea79bec21f090e2447c4808307078618 (diff)
parent59549436ef0e97351c22fd20d135e1a0b3a5a966 (diff)
downloadPeerTube-9a12f169c15b638fe78cf6e85a1993550a25e404.tar.gz
PeerTube-9a12f169c15b638fe78cf6e85a1993550a25e404.tar.zst
PeerTube-9a12f169c15b638fe78cf6e85a1993550a25e404.zip
Merge branch 'release/beta-10' into develop
-rw-r--r--CHANGELOG.md9
-rw-r--r--client/package.json2
-rw-r--r--package.json2
3 files changed, 11 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a116439ad..7062518ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
1# Changelog 1# Changelog
2 2
3## v1.0.0-beta.10
4
5**See the v1.0.0-beta.10.pre.1 changelog, in particular how to upgrade**
6
7### Bug fixes (from beta.10.pre.3)
8
9 * Fix caption upload on Mac OS
10
11
3## v1.0.0-beta.10.pre.3 12## v1.0.0-beta.10.pre.3
4 13
5**See the v1.0.0-beta.10.pre.1 changelog, in particular how to upgrade** 14**See the v1.0.0-beta.10.pre.1 changelog, in particular how to upgrade**
diff --git a/client/package.json b/client/package.json
index 34305ee44..fe7dd28a3 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
1{ 1{
2 "name": "peertube-client", 2 "name": "peertube-client",
3 "version": "1.0.0-beta.10.pre.3", 3 "version": "1.0.0-beta.10",
4 "private": true, 4 "private": true,
5 "licence": "GPLv3", 5 "licence": "GPLv3",
6 "author": { 6 "author": {
diff --git a/package.json b/package.json
index 4dbe1717e..c7163d8bb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
1{ 1{
2 "name": "peertube", 2 "name": "peertube",
3 "description": "Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.", 3 "description": "Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.",
4 "version": "1.0.0-beta.10.pre.3", 4 "version": "1.0.0-beta.10",
5 "private": true, 5 "private": true,
6 "licence": "AGPLv3", 6 "licence": "AGPLv3",
7 "engines": { 7 "engines": {