summaryrefslogtreecommitdiff
path: root/provider_base
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2013-08-22 09:37:25 -0400
committerMicah Anderson <micah@leap.se>2013-08-22 09:37:25 -0400
commit915e7e246cf08c7d2d646c068d701ddb71df7d4a (patch)
tree18c01320ce9603331285b42f6a38f175103ccce0 /provider_base
parent538fe40239c59c186099fa7e1a026969fba4ae36 (diff)
parentfb38e5f896b460e05907b493bfe0ad38006f2060 (diff)
Merge branch 'bug/3342' into develop
Diffstat (limited to 'provider_base')
-rw-r--r--provider_base/services/webapp.json3
1 files changed, 1 insertions, 2 deletions
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index b9e823da..ee61e5ab 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -3,8 +3,7 @@
"admins": [],
"modules": ["user", "billing", "help"],
"couchdb_admin_user": "= global.services[:couchdb].couch.users[:admin]",
-// "couchdb_webapp_user": "= global.services[:couchdb].couch.users[:webapp]",
- "couchdb_webapp_user": "= global.services[:couchdb].couch.users[:admin]",
+ "couchdb_webapp_user": "= global.services[:couchdb].couch.users[:webapp]",
"favicon": "= file_path 'branding/favicon.ico'",
"tail_scss": "= file_path 'branding/tail.scss'",
"head_scss": "= file_path 'branding/head.scss'",