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 431dcbe974dc57728a788a275a92bcbc985444ca..d15698b68730a588bc9947b1ab0d36958f1fe1c1 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Mar 17 07:23:46 CET 2018
+Mon Jul 23 07:24:17 CEST 2018