diff options
| author | Sam Potts <sam@potts.es> | 2019-01-26 16:50:37 +1100 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2019-01-26 16:50:37 +1100 |
| commit | 44739a17d0b2f4fbafa348370f7f32d179977045 (patch) | |
| tree | bd5b38494bdd3ea760ea54056340efb5c0714edf /demo/index.html | |
| parent | 464acd1a3636b26dba1368e4c80b603845adbc76 (diff) | |
| parent | ad72ebd4bbf487e56884d264a4bb13119fb687b5 (diff) | |
| download | plyr-44739a17d0b2f4fbafa348370f7f32d179977045.tar.lz plyr-44739a17d0b2f4fbafa348370f7f32d179977045.tar.xz plyr-44739a17d0b2f4fbafa348370f7f32d179977045.zip | |
Merge branch 'master' into develop
# Conflicts:
# changelog.md
# demo/dist/demo.js.map
# demo/dist/demo.min.js
# demo/dist/demo.min.js.map
# demo/index.html
# dist/plyr.js.map
# dist/plyr.min.js
# dist/plyr.min.js.map
# dist/plyr.polyfilled.js
# dist/plyr.polyfilled.js.map
# dist/plyr.polyfilled.min.js
# dist/plyr.polyfilled.min.js.map
# package.json
# readme.md
# yarn.lock
Diffstat (limited to 'demo/index.html')
| -rw-r--r-- | demo/index.html | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/demo/index.html b/demo/index.html index 03de5179..cc2f3bfc 100644 --- a/demo/index.html +++ b/demo/index.html @@ -33,7 +33,11 @@ <meta name="twitter:card" content="summary_large_image" /> <!-- Docs styles --> +<<<<<<< HEAD <link rel="stylesheet" href="dist/demo.css?v=2" /> +======= + <link rel="stylesheet" href="dist/demo.css?2" /> +>>>>>>> master <!-- Preload --> <link @@ -270,7 +274,11 @@ <!-- Polyfills --> <script +<<<<<<< HEAD src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6,Array.prototype.includes,CustomEvent,Object.entries,Object.values,URL,Math.trunc" +======= + src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6,Array.prototype.includes,CustomEvent,Object.entries,Object.values,URL" +>>>>>>> master crossorigin="anonymous" ></script> @@ -284,6 +292,21 @@ <script src="https://cdn.rangetouch.com/1.0.1/rangetouch.js" async crossorigin="anonymous"></script> <!-- Docs script --> +<<<<<<< HEAD <script src="dist/demo.js" crossorigin="anonymous"></script> +======= + <script async src="https://www.googletagmanager.com/gtag/js?id=UA-132699580-1"></script> + <script> + if (window.location.host === 'plyr.io') { + window.dataLayer = window.dataLayer || []; + function gtag() { + window.dataLayer.push(arguments); + } + gtag('js', new Date()); + gtag('config', 'UA-132699580-1'); + } + </script> + <script src="dist/demo.js?2" crossorigin="anonymous"></script> +>>>>>>> master </body> </html> |