Skip to content

Commit

Permalink
Merge branch 'spicer/launch-ix-video' of https://github.com/gladly-te…
Browse files Browse the repository at this point in the history
…am/tab-web into dev

# Conflicts:
#	package.json
#	yarn.lock
  • Loading branch information
Spicer Matthews committed Sep 6, 2023
2 parents 1ae4f32 + 70f9c70 commit 1642e64
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
Expand Up @@ -68,7 +68,7 @@
"remark-parse": "^9.0.0",
"remark-rehype": "^8.0.0",
"swr": "^1.0.1",
"tab-ads": "v1.1.18-beta.1",
"tab-ads": "^1.1.19",
"tab-cmp": "^0.15.0-alpha.0",
"unified": "^9.0.0",
"uuid": "^8.3.2"
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15280,10 +15280,10 @@ synchronous-promise@^2.0.15:
resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.16.tgz#669b75e86b4295fdcc1bb0498de9ac1af6fd51a9"
integrity sha512-qImOD23aDfnIDNqlG1NOehdB9IYsn1V9oByPjKY1nakv2MQYCEMyX033/q+aEtYCpmYK1cv2+NTmlH+ra6GA5A==

tab-ads@v1.1.18-beta.0:
version "1.1.18-beta.0"
resolved "https://registry.yarnpkg.com/tab-ads/-/tab-ads-1.1.18-beta.0.tgz#d3db6ed5ae286d9e41c3c7467801e37bde2f20f4"
integrity sha512-KOCTs5qOIV9AWKtlORnxzaqJgOkNC/ty0zXHrTyDfoTbS+eppslXsHIVIBL7zdBla488j3hNvrHAewtrIR4r4A==
tab-ads@^1.1.19:
version "1.1.19"
resolved "https://registry.yarnpkg.com/tab-ads/-/tab-ads-1.1.19.tgz#73d189c5e669b22679abdb7fc903a9be30994115"
integrity sha512-8GDDkM83SFJ0HgfdBq7oFwYkJVNFeslWRTdhQ7e3PiHwvgH49X2dm/rlmgBlU28j1hozSy526/5Jxyx3ZUMqgw==
dependencies:
lodash "^4.17.21"

Expand Down

0 comments on commit 1642e64

Please sign in to comment.