Sam Potts
|
248005e8e0
|
Fix merge
|
2018-07-30 23:29:02 +10:00 |
|
Sam Potts
|
dae272ef66
|
Merge branch 'develop' into a11y-improvements
# Conflicts:
# demo/dist/demo.css
# dist/plyr.css
# dist/plyr.js.map
# dist/plyr.min.js
# dist/plyr.min.js.map
# dist/plyr.polyfilled.js.map
# dist/plyr.polyfilled.min.js
# dist/plyr.polyfilled.min.js.map
# package.json
# src/js/plyr.js
|
2018-07-30 23:09:12 +10:00 |
|
Sam Potts
|
ead6601394
|
Merge
|
2018-07-02 23:11:59 +10:00 |
|
Sam Potts
|
e61ebd8d05
|
Merge branch 'develop' into a11y-improvements
|
2018-07-02 23:11:50 +10:00 |
|
Sam Potts
|
801ed63be5
|
Work on PiP
|
2016-10-23 21:21:42 +11:00 |
|
Sam
|
42a2642d40
|
Icon fix
|
2016-09-06 23:50:59 +10:00 |
|
Sam
|
37840c3844
|
Working on settings menu
|
2016-09-06 23:48:09 +10:00 |
|
Sam Potts
|
a989e87a2d
|
Changed icon prefix default to avoid clashes
|
2016-05-16 12:15:09 +10:00 |
|
Sam Potts
|
21c2276359
|
Build changes, sprite.svg => plyr.svg
|
2016-05-15 18:57:21 +10:00 |
|
