Merge branch 'master' of github.com:selz/plyr
Conflicts: .gitignore
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@ -3,4 +3,4 @@ node_modules
|
||||
*.sublime-workspace
|
||||
.DS_Store
|
||||
aws.json
|
||||
docs/index.dev.html
|
||||
docs/index.dev.html
|
Reference in New Issue
Block a user