Merge branch 'bones_was_here/playernums' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 41063ec71c4bb5c14c311f3b208ad893afd82c0d..c4c78e515c1f8ec691d4196d710486dc143c53dd 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat May 28 07:23:08 CEST 2022
+Fri Sep 30 07:23:32 CEST 2022