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 a90598bb3f2da203bf2266d3e7ec0b9091d9351f..fbb56d631ceff0189f1e8e28a0e4a9ff8ef55cfe 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jan 14 07:24:53 CET 2020
+Fri Jun 12 07:23:43 CEST 2020