Skip to content

Commit

Permalink
Merge branch 'master' of github.com:selz/plyr
Browse files Browse the repository at this point in the history 
# Conflicts:
#	dist/plyr.js
  • Loading branch information
Sam Potts committed Feb 13, 2016
2 parents ce51344 + 89e000f commit aea86b6
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 16 deletions.
Loading

0 comments on commit aea86b6

Please sign in to comment.