Merge branch 'master' into contributing

ocadotechnology · Nov 3, 2023 · d2a6e66 · d2a6e66
2 parents b514092 + 4ff42ff
commit d2a6e66
Show file tree

Hide file tree

Showing 6 changed files with 1,027 additions and 731 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 <!--next-version-placeholder-->
 
+## v5.15.2 (2023-11-03)
+
+### Fix
+
+* Upgrade Datatables to 1.13.6 ([#1511](https://github.com/ocadotechnology/rapid-router/issues/1511)) ([`e4b5353`](https://github.com/ocadotechnology/rapid-router/commit/e4b5353acb59c2e5f93e6295c9cc6ad6e62bc93b))
+
 ## v5.15.1 (2023-11-03)
 
 ### Fix

diff --git a/game/__init__.py b/game/__init__.py
@@ -1 +1 @@
-__version__ = "5.15.1"
+__version__ = "5.15.2"
diff --git a/game/static/game/css/dataTables.custom.css b/game/static/game/css/dataTables.custom.css
@@ -30,6 +30,7 @@ div.DTFC_RightBodyLiner {
 
 table.dataTable {
   border-collapse: collapse;
+  margin: 0;
 }
 
 table.dataTable thead th,