Merge branch 'master' into wip-storage-backend

This commit is contained in:
2017-03-23 12:06:36 +01:00
5 changed files with 9 additions and 3 deletions

View File

@@ -53,6 +53,8 @@ BIN_RSYNC = '/usr/bin/rsync'
GCLOUD_APP_CREDENTIALS = 'google_app.json'
GCLOUD_PROJECT = '-SECRET-'
# Used for cross-verification on various Google sites (eg. YouTube)
GOOGLE_SITE_VERIFICATION = ''
ADMIN_USER_GROUP = '5596e975ea893b269af85c0e'
SUBSCRIBER_USER_GROUP = '5596e975ea893b269af85c0f'