Skip to content

Commit

Permalink
Merge branch 'master' into candidate
Browse files Browse the repository at this point in the history
  • Loading branch information
samtingleff committed Dec 16, 2019
2 parents 740d3b8 + 3161e49 commit 680f66b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "digitrust",
"version": "1.5.39",
"version": "1.5.40",
"description": "Package for a universal ID for registered ad servers",
"main": "dist/digitrust.min.js",
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions src/config/general.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"prod": {
"urls": {
"digitrustHostPath": "https://cdn.digitru.st/prod/1.5.39/",
"digitrustRedirect": "https://cdn.digitru.st/prod/1.5.39/redirect.html",
"digitrustIframe": "https://cdn.digitru.st/prod/1.5.39/dt.html",
"digitrustHostPath": "https://cdn.digitru.st/prod/1.5.40/",
"digitrustRedirect": "https://cdn.digitru.st/prod/1.5.40/redirect.html",
"digitrustIframe": "https://cdn.digitru.st/prod/1.5.40/dt.html",
"digitrustIdService": "https://cdn-cf.digitru.st/id/v1",
"optoutInfo": "http://www.digitru.st/about-this-notice/",
"adblockCheck": "http://stats.aws.rubiconproject.com/"
Expand All @@ -23,7 +23,7 @@
"digitrust": {
"domainKeyValue": "domain=.digitru.st;",
"pathKeyValue": "path=/;",
"maxAgeMiliseconds": 157680000000,
"maxAgeMiliseconds": 31536000000,
"userObjectKey": "DigiTrust.v1.identity",
"resetKey": "DeleteEverything",
"challenge": "DTChal",
Expand Down

0 comments on commit 680f66b

Please sign in to comment.