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 5b09daf130eb47b621cb48a2f8fd9b20dd3008bc..afd42183adad9cf255205fceb4e6719f9ee2da59 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Feb 27 07:24:13 CET 2019
+Mon May  6 07:24:29 CEST 2019