Merge branch 'bones_was_here/whitelist_casings' into 'master'

[xonotic/xonotic-data.pk3dir.git] / .tx / merge-base

diff --git a/.tx/merge-base b/.tx/merge-base
index b4d361e0740c9820ace8ea1699cfc6d2afb37e72..fbb56d631ceff0189f1e8e28a0e4a9ff8ef55cfe 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Feb 20 07:24:21 CET 2020
+Fri Jun 12 07:23:43 CEST 2020