diff options
| author | Gérald Niel <gerald.niel@gegeweb.org> | 2018-04-19 19:28:55 +0200 |
|---|---|---|
| committer | Gérald Niel <gerald.niel@gegeweb.org> | 2018-04-19 19:28:55 +0200 |
| commit | 0db1a226507a39b0a663e3e63f04851836a44d5a (patch) | |
| tree | 8c8dad658ea5608afaae238cfb6fe803292f908f /config/test.yaml | |
| parent | 0030284b0df2983914291d6fe83675e2aa892e6a (diff) | |
| parent | d4f3fea659163749f9ea879a5e1dd313106353c6 (diff) | |
| download | PeerTube-0db1a226507a39b0a663e3e63f04851836a44d5a.tar.gz PeerTube-0db1a226507a39b0a663e3e63f04851836a44d5a.tar.zst PeerTube-0db1a226507a39b0a663e3e63f04851836a44d5a.zip | |
Merge branch 'develop' of framagit.org:chocobozzz/PeerTube into develop
Diffstat (limited to 'config/test.yaml')
| -rw-r--r-- | config/test.yaml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/test.yaml b/config/test.yaml index 7e395db04..020987920 100644 --- a/config/test.yaml +++ b/config/test.yaml | |||
| @@ -32,3 +32,6 @@ transcoding: | |||
| 32 | 480p: true | 32 | 480p: true |
| 33 | 720p: true | 33 | 720p: true |
| 34 | 1080p: true | 34 | 1080p: true |
| 35 | |||
| 36 | instance: | ||
| 37 | default_nsfw_policy: 'display' \ No newline at end of file | ||