diff options
| author | Sam Potts <me@sampotts.me> | 2017-03-25 11:24:38 +1100 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2017-03-25 11:24:38 +1100 |
| commit | b083bf4297396712e3b3a7270a3658c9fd7aff7a (patch) | |
| tree | 72f856d6b431a26e24b3ddfbb34808944f18220d /demo | |
| parent | ebc7ed538a292211cf45cc6b638e9527170d0f06 (diff) | |
| parent | 4957e4d80c833bbfa915c0c20d3d79245221b6f6 (diff) | |
| download | plyr-b083bf4297396712e3b3a7270a3658c9fd7aff7a.tar.lz plyr-b083bf4297396712e3b3a7270a3658c9fd7aff7a.tar.xz plyr-b083bf4297396712e3b3a7270a3658c9fd7aff7a.zip | |
Merge branch 'master' into develop
# Conflicts:
# dist/plyr.css
# dist/plyr.js
# src/js/plyr.js
# src/less/plyr.less
# src/scss/plyr.scss
Diffstat (limited to 'demo')
| -rw-r--r-- | demo/index.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demo/index.html b/demo/index.html index c9f2d036..c8aa7d0e 100644 --- a/demo/index.html +++ b/demo/index.html @@ -67,8 +67,8 @@ <ul> <li class="plyr__cite plyr__cite--video"><small><a href="http://viewfromabluemoon.com/" target="_blank">View From A Blue Moon</a> © Brainfarm</small></li> <li class="plyr__cite plyr__cite--audio"><small><a href="http://www.kishibashi.com/" target="_blank">Kishi Bashi – “It All Began With A Burst”</a> © Kishi Bashi</small></li> - <li class="plyr__cite plyr__cite--youtube"><small><a href="https://www.youtube.com/watch?v=bTqVqk7FSmY" target="_blank">View From A Blue Moon</a> on <span class="color--youtube"><svg class="icon"><use xlink:href="#icon-youtube"/></svg>YouTube</span></small> - <li class="plyr__cite plyr__cite--vimeo"><small><a href="https://vimeo.com/ondemand/viewfromabluemoon4k" target="_blank">View From A Blue Moon</a> on <span class="color--vimeo"><svg class="icon"><use xlink:href="#icon-vimeo"/></svg>Vimeo</span></small> + <li class="plyr__cite plyr__cite--youtube"><small><a href="https://www.youtube.com/watch?v=bTqVqk7FSmY" target="_blank">View From A Blue Moon</a> on <span class="color--youtube"><svg class="icon"><use xlink:href="#icon-youtube"/></svg>YouTube</span></small></li> + <li class="plyr__cite plyr__cite--vimeo"><small><a href="https://vimeo.com/ondemand/viewfromabluemoon4k" target="_blank">View From A Blue Moon</a> on <span class="color--vimeo"><svg class="icon"><use xlink:href="#icon-vimeo"/></svg>Vimeo</span></small></li> </ul> </section> </main> |