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 /client/e2e/proxy.config.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 'client/e2e/proxy.config.json')
0 files changed, 0 insertions, 0 deletions