]> git.proxmox.com Git - mirror_xterm.js.git/commitdiff
Merge branch 'master' into 765_scroll_needlessly
authorDaniel Imms <tyriar@tyriar.com>
Sun, 9 Jul 2017 23:40:55 +0000 (16:40 -0700)
committerGitHub <noreply@github.com>
Sun, 9 Jul 2017 23:40:55 +0000 (16:40 -0700)

Trivial merge