diff options
| author | Sam Potts <me@sampotts.me> | 2018-01-19 14:30:11 +1100 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2018-01-19 14:30:11 +1100 |
| commit | 986c802acd10dece4e45c43834af198b37b8beb2 (patch) | |
| tree | 5efd47c02a339fe8485a2bf630c8fe420dc2d79d /demo | |
| parent | 98dd818bf61526fe8e69eb85f0fbd3d4efd249b5 (diff) | |
| parent | 392f837398a1ff793da56299ca3f0be961bc488e (diff) | |
| download | plyr-986c802acd10dece4e45c43834af198b37b8beb2.tar.lz plyr-986c802acd10dece4e45c43834af198b37b8beb2.tar.xz plyr-986c802acd10dece4e45c43834af198b37b8beb2.zip | |
Merge branch 'beta-with-ads' of github.com:sampotts/plyr into beta-with-ads
# Conflicts:
# src/js/plugins/ads.js
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions