Merge branch 'develop' of github.com:sampotts/plyr into develop

Browse Source

# Conflicts:
#	src/js/controls.js
#	src/sass/components/volume.scss

...

This commit is contained in:

Sam Potts 2020-01-14 07:46:48 +00:00

parent 53a400027f 28a1098c0f

commit 7ee041403f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available