Merge remote-tracking branch 'origin/master' into Juhu/strafehud

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 1bafc5c83e378fd9504d6b661cb2217cbdb2c3a3..42ea6ccdca27a01ccd61f46e5a32691c4351af7f 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Feb 17 07:24:21 CET 2020
+Sat Jun 20 07:23:43 CEST 2020