X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=46c1a5ef7295669154902c294452a9fc92c18eed;hp=426ef8f0bd5439d543ff2aa0a0154cd72151f3db;hb=c34250b1c5b47a8771ad21e0d38e905aaaad17fc;hpb=bad77b6f936042970fb596f4fcdf3fcd12a0c3ea

diff --git a/.tx/merge-base b/.tx/merge-base
index 426ef8f0b..46c1a5ef7 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Jul 12 07:23:31 CEST 2021
+Sun Jan 16 07:23:33 CET 2022