diff options
| author | Sam Potts <me@sampotts.me> | 2017-03-29 09:05:25 +1100 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2017-03-29 09:05:25 +1100 |
| commit | 889712761a1412ab709bda8658a9b677cd1e76e1 (patch) | |
| tree | c386e863496fe3416ff791c5dc784033480768d8 /demo/src | |
| parent | 46fab972a0ac3cb1396d025ecb755e577156714a (diff) | |
| parent | 535c046b6229b50b529c42e862bbda20bf23d1c2 (diff) | |
| download | plyr-889712761a1412ab709bda8658a9b677cd1e76e1.tar.lz plyr-889712761a1412ab709bda8658a9b677cd1e76e1.tar.xz plyr-889712761a1412ab709bda8658a9b677cd1e76e1.zip | |
Merge branch 'develop' of github.com:Selz/plyr into develop
# Conflicts:
# dist/plyr.js
# src/js/plyr.js
Diffstat (limited to 'demo/src')
0 files changed, 0 insertions, 0 deletions