diff options
| author | Jakob Odersky <jodersky@gmail.com> | 2014-05-11 13:57:37 +0200 |
|---|---|---|
| committer | Jakob Odersky <jodersky@gmail.com> | 2014-05-11 13:57:37 +0200 |
| commit | 370244a1003e3c16f024116d14401e7959325ede (patch) | |
| tree | 0a00b60688f6ecab51cf13913e161e31058e5866 /app/index.html | |
| parent | 89639a36f7412e1855d539dcca26f86e8daa4a0e (diff) | |
| parent | 68579f3a451b910ffa47ed9cc7414a5e0338105f (diff) | |
| download | playGraph-370244a1003e3c16f024116d14401e7959325ede.tar.gz playGraph-370244a1003e3c16f024116d14401e7959325ede.tar.bz2 playGraph-370244a1003e3c16f024116d14401e7959325ede.zip | |
Merge branch 'master' of github.com:jodersky/playGraph
Conflicts:
app/js/directives.js
Diffstat (limited to 'app/index.html')
| -rw-r--r-- | app/index.html | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/index.html b/app/index.html index 3b7e019..1b15a7e 100644 --- a/app/index.html +++ b/app/index.html @@ -45,6 +45,12 @@ <li data-ng-repeat="song in playseq">{{song.label}}</li> </ul> </fieldset> + + <iframe id="ytplayer" type="text/html" width="640" height="360" +src="https://www.youtube.com/embed/M7lc1UVf-VE?autoplay=1&modestbranding=1" +frameborder="0" allowfullscreen></iframe> + + </div> <div id="column-middle"> <div class="world"> |