Merge branch 'terencehill/formatmessage_fix' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 9745f61361ea974460edaf8e9c90a96700d78cb1..d15698b68730a588bc9947b1ab0d36958f1fe1c1 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jun  3 07:24:16 CEST 2018
+Mon Jul 23 07:24:17 CEST 2018