aboutsummaryrefslogtreecommitdiffstats
path: root/src/js/utils/style.js
diff options
context:
space:
mode:
authorSam Potts <sam@potts.es>2018-11-11 11:05:09 +1100
committerSam Potts <sam@potts.es>2018-11-11 11:05:09 +1100
commitb7b2e3c0aa0749eed53ae91230082cb0482e1f28 (patch)
treef073bde14df6459419323dd6570b2549b8d26c41 /src/js/utils/style.js
parent3e0a91141822758094b2cbd5f0ecdd8ce4142b5f (diff)
parent2c8a337f265f3f84133bc674f3836802588c0c13 (diff)
downloadplyr-b7b2e3c0aa0749eed53ae91230082cb0482e1f28.tar.lz
plyr-b7b2e3c0aa0749eed53ae91230082cb0482e1f28.tar.xz
plyr-b7b2e3c0aa0749eed53ae91230082cb0482e1f28.zip
Merge branch 'develop' into css-variables
# Conflicts: # demo/dist/demo.css # demo/dist/demo.js # demo/dist/demo.js.map # demo/dist/demo.min.js # demo/dist/demo.min.js.map # dist/plyr.css # dist/plyr.js # 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 # gulpfile.js # src/sass/components/captions.scss # src/sass/components/control.scss
Diffstat (limited to 'src/js/utils/style.js')
0 files changed, 0 insertions, 0 deletions