Skip to content

Commit

Permalink
Issue #SB-000 merge: Merge pull request #116 from project-sunbird/rel…
Browse files Browse the repository at this point in the history
…ease-1.14.2

Merge Release 1.14.2 to Release-1.14.0-Sp3
  • Loading branch information
pallakartheekreddy authored Mar 8, 2019
2 parents b322735 + 951997a commit 9c67241
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions player/public/js/appConfig-Sunbird.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ AppConfig = {
"application/vnd.ekstep.ecml-archive", "application/vnd.ekstep.html-archive", "application/vnd.ekstep.h5p-archive", "application/epub", "video/mp4", "application/pdf", "video/x-youtube", "video/webm"
],
whiteListUrl: [
"self",
"https://*.blob.core.windows.net/**",
"https://ekstep-public-qa.s3-ap-south-1.amazonaws.com/**"
'self',
'https://*.blob.core.windows.net/**',
'https://ekstep-public-*.s3-ap-south-1.amazonaws.com/**'
],
defaultMetadata: {
"identifier": "org.ekstep.item.sample",
Expand Down
6 changes: 3 additions & 3 deletions player/public/js/appConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ AppConfig = {
"application/vnd.ekstep.ecml-archive", "application/vnd.ekstep.html-archive", "application/vnd.ekstep.h5p-archive", "application/epub", "video/mp4", "application/pdf", "video/x-youtube", "video/webm"
],
whiteListUrl: [
"self",
"https://*.blob.core.windows.net/**",
"https://ekstep-public-qa.s3-ap-south-1.amazonaws.com/**"
'self',
'https://*.blob.core.windows.net/**',
'https://ekstep-public-*.s3-ap-south-1.amazonaws.com/**'
],
defaultMetadata: {
"identifier": "org.ekstep.item.sample",
Expand Down

0 comments on commit 9c67241

Please sign in to comment.