diff options
| author | Sam Potts <sam@potts.es> | 2020-04-24 00:22:17 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2020-04-24 00:22:17 +1000 |
| commit | 2458eaa11b5c2805bcf1e5349ab900485bac325f (patch) | |
| tree | 8c38683d043fdfbe8b1dcb385a446de4df7396a1 /src/js/utils/load-sprite.js | |
| parent | a97008aeebb19678e5183e7c934e60729857e11b (diff) | |
| parent | dbe618c644a525b196466b7254274cc9bde76275 (diff) | |
| download | plyr-2458eaa11b5c2805bcf1e5349ab900485bac325f.tar.lz plyr-2458eaa11b5c2805bcf1e5349ab900485bac325f.tar.xz plyr-2458eaa11b5c2805bcf1e5349ab900485bac325f.zip | |
Merge branch 'develop' into css-variables
# Conflicts:
# src/js/captions.js
# src/js/config/defaults.js
# src/js/fullscreen.js
# src/js/listeners.js
# src/js/plyr.js
Diffstat (limited to 'src/js/utils/load-sprite.js')
0 files changed, 0 insertions, 0 deletions