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 6b9bef88e8973e712d8c855c7bfa7228018d7e95..fbb56d631ceff0189f1e8e28a0e4a9ff8ef55cfe 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Mar 29 07:24:37 CEST 2020
+Fri Jun 12 07:23:43 CEST 2020