Merge branch 'master' of git.0x2620.org:/pandora_cdosea

This commit is contained in:
rlx 2016-08-09 16:25:42 +02:00
commit 7463a89177

View file

@ -950,7 +950,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
"userLevels" is an ordered list of user classes. The first entry is for "userLevels" is an ordered list of user classes. The first entry is for
unregistered visitors. unregistered visitors.
*/ */
"userLevels": ["guest", "member", "staff", "admin"], "userLevels": ["guest", "member", "admin"],
/* /*
"video" contains the video settings. "video" contains the video settings.
"formats": Supported video formats. Should be ["webm", "mp4"], or "formats": Supported video formats. Should be ["webm", "mp4"], or
@ -965,6 +965,6 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
"formats": ["webm", "mp4"], "formats": ["webm", "mp4"],
"previewRatio": 1.3333333333, "previewRatio": 1.3333333333,
"resolutions": [240, 480], "resolutions": [240, 480],
"torrent": true "torrent": false
} }
} }