Merge branch 'Mario/monsters' into 'develop'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index e4ef3cf3eb5a82a62a265f38c0ab87a3a5cb59db..41063ec71c4bb5c14c311f3b208ad893afd82c0d 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Apr  2 07:23:07 CEST 2022
+Sat May 28 07:23:08 CEST 2022