Merge branch 'terencehill/countrylist_removal' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index f5e13c065874b2bb73ce52ad7e1d6edb3a630cac..afd42183adad9cf255205fceb4e6719f9ee2da59 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Dec 25 07:24:03 CET 2018
+Mon May  6 07:24:29 CEST 2019