Commit Graph

4 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
Samuel Mannehed 3ba5cefef2 Update generated JS files for translations 2019-04-09 16:22:16 +02:00
Samuel Mannehed 76fa34a635 Update .json for Dutch and Swedish translations 2017-10-11 10:52:48 +02:00
Solly Ross 2a7c6d20ab Load translations over XHR
This commit causes translations to be loaded over XHR instead of
the import system.
2017-03-07 11:11:29 -05:00