Merge branch 'morosophos/packer-doors-always-open' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 5a673cc48c4493e61de48af55a465b7ca05bb62f..67a023d4c8fb61a4e1b494e3b59c6d9a00a4f553 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Dec 27 07:24:01 CET 2018
+Thu Sep 12 07:24:50 CEST 2019