Commit Graph

5 Commits

Author SHA1 Message Date
502d5977d7 Converted to 2 space indentation 2020-04-11 16:23:14 +10:00
da943b384c Merge branch 'develop' into css-variables
# Conflicts:
#	demo/dist/demo.css
#	demo/dist/demo.min.js.map
#	demo/index.html
#	dist/plyr.css
#	dist/plyr.min.js.map
#	dist/plyr.min.mjs.map
#	dist/plyr.polyfilled.min.js.map
#	dist/plyr.polyfilled.min.mjs.map
#	gulpfile.js
#	src/sass/base.scss
#	src/sass/components/control.scss
#	src/sass/settings/colors.scss
#	src/sass/settings/controls.scss
2020-03-30 10:45:57 +11:00
3e0a911418 WIP 2018-05-26 13:37:10 +10:00
Sam
92cb9e22e2 Started on error handling 2018-01-04 13:43:56 +11:00
f3df7aba15 Split up settings file 2017-12-20 18:00:05 +00:00