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 d795790ea67bc092e05c23ce192699edd502f2d3..67a023d4c8fb61a4e1b494e3b59c6d9a00a4f553 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri May 24 07:24:30 CEST 2019
+Thu Sep 12 07:24:50 CEST 2019