Commit Graph

2 Commits

Author SHA1 Message Date
Alt, Michael 98ff5993dc Merge branch 'master' of https://github.com/novnc/noVNC
# Conflicts:
#	core/display.js
#	core/rfb.js
#	package.json
2021-07-19 09:23:22 +02:00
gbrehmer bbb1ef22d4
disable karma tests 2019-12-12 14:59:41 +01:00