diff options
author | Chocobozzz <me@florianbigard.com> | 2019-02-06 13:41:17 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-02-06 13:41:17 +0100 |
commit | 552dd3306fe867d8be30508ef9f30a1738241082 (patch) | |
tree | 37cce63157ea13299b9fb2749bb9efb6e6d43c5b /client | |
parent | 9fb6cfc49b38d006d1d25e09efedf15f87c44310 (diff) | |
parent | f5305c04aae14467d6f957b713c5a902275cbb89 (diff) | |
download | PeerTube-552dd3306fe867d8be30508ef9f30a1738241082.tar.gz PeerTube-552dd3306fe867d8be30508ef9f30a1738241082.tar.zst PeerTube-552dd3306fe867d8be30508ef9f30a1738241082.zip |
Merge branch 'release/v1.2.0' into develop
Diffstat (limited to 'client')
-rw-r--r-- | client/package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/package.json b/client/package.json index 42deddd5f..31fc77887 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.2.0-rc.1", | 3 | "version": "1.2.0", |
4 | "private": true, | 4 | "private": true, |
5 | "licence": "GPLv3", | 5 | "licence": "GPLv3", |
6 | "author": { | 6 | "author": { |