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 b77de01f24a17096f09136dc61fa6e032cd47fd2..c4c78e515c1f8ec691d4196d710486dc143c53dd 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Sep 16 07:23:25 CEST 2022
+Fri Sep 30 07:23:32 CEST 2022