Merge branch 'master' into Mario/status_effects_extended

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 518c3a6e565fcb7379e06a70c72b42963210ef04..f61783799b00b59d7eb405b5a870c62117c33500 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Dec 20 07:24:56 CET 2020
+Tue Jun 15 07:23:51 CEST 2021