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 f7e1fc243a25740a9e332b1c022c8fae815db1e1..d15698b68730a588bc9947b1ab0d36958f1fe1c1 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jun  2 07:24:20 CEST 2018
+Mon Jul 23 07:24:17 CEST 2018