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 3485be8fc314d6ab5a88c0a6db3a76b0e5f2a8a1..67a023d4c8fb61a4e1b494e3b59c6d9a00a4f553 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Mar 10 07:25:18 CET 2019
+Thu Sep 12 07:24:50 CEST 2019