diff options
author | Chocobozzz <me@florianbigard.com> | 2020-06-02 09:31:30 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-06-02 09:31:30 +0200 |
commit | b763f88dd0f455ce0ccae9cb81182c985a47c101 (patch) | |
tree | 56f95f165795b782832609d53b41098a7b651a99 /client/proxy.config.json | |
parent | cdd8f7790c759664fe4d0962efa550cf1a8e37eb (diff) | |
parent | f3e887e5f0f5669d09ca6fad13f3a39095d4b2f0 (diff) | |
download | PeerTube-b763f88dd0f455ce0ccae9cb81182c985a47c101.tar.gz PeerTube-b763f88dd0f455ce0ccae9cb81182c985a47c101.tar.zst PeerTube-b763f88dd0f455ce0ccae9cb81182c985a47c101.zip |
Merge branch 'release/2.2.0' into develop
Diffstat (limited to 'client/proxy.config.json')
0 files changed, 0 insertions, 0 deletions