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 35a62f15634854a24f331e94f68ec1cedcdf85ed..afd42183adad9cf255205fceb4e6719f9ee2da59 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Apr 20 07:24:16 CEST 2019
+Mon May  6 07:24:29 CEST 2019