plyr.git - A fork of plyr without nonfree parts

about summary refs log tree commit diff stats

path: root/src/js/utils/time.js

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'develop' into a11y-improvements	Sam Potts	2018-06-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # 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 # src/js/controls.js # src/js/fullscreen.js # src/js/plyr.js # src/js/ui.js # src/js/utils.js
*	Utils broken down into seperate files and exports	Sam Potts	2018-06-13	1	-0/+36