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 5e57f5a78d0b86e3751baa6146ea41b1d3ee4c95..d15698b68730a588bc9947b1ab0d36958f1fe1c1 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Feb 13 07:23:41 CET 2018
+Mon Jul 23 07:24:17 CEST 2018