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 e356a5d8651eaf48405d7cd183bccef81f717ba1..d15698b68730a588bc9947b1ab0d36958f1fe1c1 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed May 23 07:24:29 CEST 2018
+Mon Jul 23 07:24:17 CEST 2018