diff options
author | Sam Potts <me@sampotts.me> | 2017-10-08 19:12:55 +1100 |
---|---|---|
committer | Sam Potts <me@sampotts.me> | 2017-10-08 19:12:55 +1100 |
commit | 4392abfc49d0847c7903d6b5854dabdb07b239ff (patch) | |
tree | 29750e1155f7c385e76d358477d0ded83cb7cc4e /demo | |
parent | 3238b6a36a405838c703f9fbb2d6ec4bdbadd273 (diff) | |
parent | 02cb093f7b9003ad045b95aa42e75cd9636bae13 (diff) | |
download | plyr-4392abfc49d0847c7903d6b5854dabdb07b239ff.tar.lz plyr-4392abfc49d0847c7903d6b5854dabdb07b239ff.tar.xz plyr-4392abfc49d0847c7903d6b5854dabdb07b239ff.zip |
Merge branch 'develop' of https://github.com/Selz/plyr into develop
# Conflicts:
# dist/plyr.js
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions