Merge branch 'master' into 1.1

This commit is contained in:
An Phan 2015-12-22 10:45:50 +08:00
commit ae9be63a4a

View file

@ -4,6 +4,9 @@
@keydown.j = "playNext"
@keydown.k = "playPrev"
@keydown.f = "search"
@keydown.177 = "playPrev"
@keydown.176 = "playNext"
@keydown.179 = "togglePlayback"
>
<site-header></site-header>
<main-wrapper></main-wrapper>