Merge branch 'master' of https://github.com/maxerenberg/Iris into maxerenberg-master

This commit is contained in:
James Barnsley
2020-11-14 21:52:42 +13:00
16 changed files with 555874 additions and 42 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -106,8 +106,13 @@
// Release details
// These are automatically injected to built HTML
<<<<<<< HEAD
var build = "1605340269";
var version = "3.54.1";
=======
var build = "1598940390";
var version = "3.52.4";
>>>>>>> c7462e44a9fa9a2d85a1e529f43f43d7edd97d83
// Construct the script tag
var js = document.createElement("script");