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

diff --git a/.tx/merge-base b/.tx/merge-base
index b744a803c..3a32be1a8 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Apr 12 07:23:44 CEST 2021
+Thu Jun 24 07:23:45 CEST 2021