X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=3a32be1a8a5952e022d29e10c716fa47115e1829;hb=b589834601abc0631f63c890fbd1b707a3dd8530;hp=4c1820d42595ab308e5e297749af354b48aa9e72;hpb=284334672cb58cfba660f8f5ef8f0b296faca5fe;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 4c1820d42..3a32be1a8 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Mar 16 07:23:58 CET 2021
+Thu Jun 24 07:23:45 CEST 2021