Merge branch 'master' into develop

# Conflicts:
#	gulpfile.js
This commit is contained in:
Sam Potts
2019-02-23 13:08:32 +11:00
20 changed files with 24 additions and 24 deletions

View File

@ -1,6 +1,6 @@
{
"name": "plyr",
"version": "3.5.0-beta.4",
"version": "3.5.0",
"description": "A simple, accessible and customizable HTML5, YouTube and Vimeo media player",
"homepage": "https://plyr.io",
"author": "Sam Potts <sam@potts.es>",