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 /package.json | |
| 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 'package.json')
| -rw-r--r-- | package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json index f91bf8593..0cf39c7ee 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.2.0-rc.1", | 4 | "version": "1.2.0", |
| 5 | "private": true, | 5 | "private": true, |
| 6 | "licence": "AGPLv3", | 6 | "licence": "AGPLv3", |
| 7 | "engines": { | 7 | "engines": { |