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 /server/controllers/services.ts | |
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 'server/controllers/services.ts')
0 files changed, 0 insertions, 0 deletions