Sam ee2cdb2c9b Merge branch 'master' into develop ...

# Conflicts:
#	dist/plyr.css
#	dist/plyr.js
#	docs/dist/docs.css
#	docs/dist/docs.js
#	docs/index.html
#	docs/src/js/docs.js
#	docs/src/less/components/icons.less
#	docs/src/less/components/type.less
#	docs/src/less/docs.less
#	gulpfile.js
#	package.json
#	src/js/plyr.js

2015-12-13 22:49:02 +11:00

..

dist

Removed Hogan from Docs (Fixes #128)

2015-12-11 10:41:29 +11:00

src

Merge branch 'master' into develop

2015-12-13 22:49:02 +11:00

error.html

Removed Hogan from Docs (Fixes #128)

2015-12-11 10:41:29 +11:00

index.html

Merge branch 'master' into develop

2015-12-13 22:49:02 +11:00

index.master.html

Removed Hogan from Docs (Fixes #128)

2015-12-11 10:41:29 +11:00

poster.jpg

Icon tweaks, other small tweaks

2015-10-03 10:43:27 +10:00