diff options
author | Chocobozzz <me@florianbigard.com> | 2020-06-02 11:18:29 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-06-02 11:18:29 +0200 |
commit | 35b30b643cf9870b0934f34253ffb23cf6a264b0 (patch) | |
tree | 416cef0a63f1a6b8cda4adbc1b663f4b269f250f /package.json | |
parent | b763f88dd0f455ce0ccae9cb81182c985a47c101 (diff) | |
parent | a55c98031b1287bc568c14917bc5588c3badd8af (diff) | |
download | PeerTube-35b30b643cf9870b0934f34253ffb23cf6a264b0.tar.gz PeerTube-35b30b643cf9870b0934f34253ffb23cf6a264b0.tar.zst PeerTube-35b30b643cf9870b0934f34253ffb23cf6a264b0.zip |
Merge branch 'release/2.2.0' into develop
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json index e33416f48..b94c7f7ab 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": "2.2.0-rc.1", | 4 | "version": "2.2.0", |
5 | "private": true, | 5 | "private": true, |
6 | "licence": "AGPL-3.0", | 6 | "licence": "AGPL-3.0", |
7 | "engines": { | 7 | "engines": { |