Merge branch '3.0' of github.com:calzoneman/sync into 3.0

This commit is contained in:
calzoneman 2014-04-08 16:52:13 -05:00
commit 5c9c096209
1 changed files with 6 additions and 0 deletions

View File

@ -66,6 +66,12 @@ var defaults = {
"purge-interval": 3600000, "purge-interval": 3600000,
"max-age": 2592000000 "max-age": 2592000000
}, },
"vimeo-workaround": false,
"vimeo-oauth": {
enabled: false,
"consumer-key": "",
secret: ""
},
"html-template": { "html-template": {
title: "CyTube Beta", description: "Free, open source synchtube" title: "CyTube Beta", description: "Free, open source synchtube"
}, },