Merging from develop

This commit is contained in:
James Barnsley
2020-11-12 21:13:59 +13:00
14 changed files with 633 additions and 262 deletions

View File

@ -106,7 +106,11 @@
// Release details
// These are automatically injected to built HTML
<<<<<<< HEAD
var build = "1605168574";
=======
var build = "1605167537";
>>>>>>> develop
var version = "3.54.0";
// Construct the script tag