]> git.proxmox.com Git - mirror_xterm.js.git/commitdiff
Merge branch 'master' into 732_drop_selection_on_alt
authorDaniel Imms <tyriar@tyriar.com>
Fri, 30 Jun 2017 16:36:26 +0000 (09:36 -0700)
committerGitHub <noreply@github.com>
Fri, 30 Jun 2017 16:36:26 +0000 (09:36 -0700)

Trivial merge