Sam Potts 35f7ee9c59 Merge branch 'develop' into css-variables ...

# Conflicts:
#	demo/dist/demo.css
#	demo/index.html
#	dist/plyr.css
#	gulpfile.js
#	package.json
#	yarn.lock

2019-03-16 12:14:20 +11:00

..

components

Merge branch 'develop' into css-variables

2019-03-16 12:14:20 +11:00

lib

Merge branch 'develop' into css-variables

2019-03-16 12:14:20 +11:00

plugins

Plugin tweaks for ads and previews

2019-01-26 16:31:47 +11:00

settings

Merge branch 'develop' into css-variables

2019-03-16 12:14:20 +11:00

states

Remove ui.checkFailed() and error class

2018-05-16 23:21:06 +02:00

utils

Work on menus

2018-06-21 09:01:16 +10:00

base.scss

v3.3.0

2018-05-06 00:49:12 +10:00

plyr.scss

Merge branch 'develop' into css-variables

2019-03-16 12:14:20 +11:00