Post-merge buildout

This commit is contained in:
James Barnsley
2019-01-28 09:50:29 +13:00
parent 3769a05669
commit 69f2d666f2
5 changed files with 3 additions and 992 deletions

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

@ -98,13 +98,8 @@
// Release details
// These are automatically injected to built HTML
<<<<<<< HEAD
var build = "1548618298";
var version = "3.31.8";
=======
var build = "1548618739";
var build = "1548619062";
var version = "3.32.0";
>>>>>>> master
// Construct the script tag
var js = document.createElement("script");