Merge branch 'master' into Mario/headshots

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

diff --git a/.tx/merge-base b/.tx/merge-base
index a90598bb3f2da203bf2266d3e7ec0b9091d9351f..25aec9d460c9e902d48c89b007064a6500007437 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jan 14 07:24:53 CET 2020
+Mon Jul 13 07:23:53 CEST 2020