Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Aiholkin committed Jan 20, 2021
2 parents 6e2a64b + e33c62d commit 32c71f2
Show file tree
Hide file tree
Showing 24 changed files with 2,127 additions and 48 deletions.
3 changes: 2 additions & 1 deletion modules/.submodules.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"idxIdSystem",
"fabrickIdSystem",
"verizonMediaIdSystem",
"pubProvidedIdSystem"
"pubProvidedIdSystem",
"tapadIdSystem"
],
"adpod": [
"freeWheelAdserverVideo",
Expand Down
Loading

0 comments on commit 32c71f2

Please sign in to comment.