]> git.proxmox.com Git - mirror_novnc.git/commitdiff
Merge branch 'CendioOssman-toolbar' into master
authorSamuel Mannehed <samuel@cendio.se>
Fri, 30 Sep 2016 19:36:38 +0000 (21:36 +0200)
committerSamuel Mannehed <samuel@cendio.se>
Fri, 30 Sep 2016 19:36:38 +0000 (21:36 +0200)

Trivial merge