]> git.proxmox.com Git - mirror_novnc.git/commitdiff
Merge branch 'master' of https://github.com/josiah2009/noVNC
authorPierre Ossman <ossman@cendio.se>
Thu, 14 Dec 2017 11:50:38 +0000 (12:50 +0100)
committerPierre Ossman <ossman@cendio.se>
Thu, 14 Dec 2017 11:50:38 +0000 (12:50 +0100)
1  2 
core/display.js

diff --cc core/display.js
Simple merge