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 @@
// ==========================================================================
// Plyr
// plyr.js v3.5.0-beta.4
// plyr.js v3.5.0
// https://github.com/sampotts/plyr
// License: The MIT License (MIT)
// ==========================================================================