Merge branch 'master' into Mario/fix_me

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

diff --git a/.tx/merge-base b/.tx/merge-base
index f5e13c065874b2bb73ce52ad7e1d6edb3a630cac..e21e87920aab30a85fdcffe8b91327fbfc40c4c2 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Dec 25 07:24:03 CET 2018
+Sat Jan 12 07:24:11 CET 2019