ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:selz/plyr

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Sam Potts
2015-03-02 19:50:56 +11:00
parent 6cbcfd75d1 ce39369d84
commit b6d5ba43ec
14 changed files with 121 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -3,4 +3,4 @@ node_modules
*.sublime-workspace
.DS_Store
aws.json
docs/index.dev.html
docs/index.dev.html