diff options
| author | Sam Potts <sam@potts.es> | 2020-10-19 22:31:31 +1100 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2020-10-19 22:31:31 +1100 |
| commit | df91f7faace72e3327500975f8907251f41e9886 (patch) | |
| tree | ce9db4cecb8abc746a80a405142768dc61f69eeb /src/js/utils/objects.js | |
| parent | 776b0c40367e7a184eb7db2673c246048cb5fcb8 (diff) | |
| parent | 9a69ae25993f8e2e6b30c2435aba98f779e129ad (diff) | |
| download | plyr-df91f7faace72e3327500975f8907251f41e9886.tar.lz plyr-df91f7faace72e3327500975f8907251f41e9886.tar.xz plyr-df91f7faace72e3327500975f8907251f41e9886.zip | |
Merge branch 'master' into develop
# Conflicts:
# README.md
# demo/dist/demo.min.js
# demo/dist/demo.min.js.map
# dist/plyr.min.js
# dist/plyr.min.js.map
# dist/plyr.min.mjs
# dist/plyr.min.mjs.map
# dist/plyr.polyfilled.min.js
# dist/plyr.polyfilled.min.js.map
# dist/plyr.polyfilled.min.mjs
# dist/plyr.polyfilled.min.mjs.map
# package.json
# src/js/plugins/vimeo.js
# src/js/plugins/youtube.js
# src/js/ui.js
# yarn.lock
Diffstat (limited to 'src/js/utils/objects.js')
0 files changed, 0 insertions, 0 deletions