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

diff --git a/.tx/merge-base b/.tx/merge-base
index a7a5dfbdd..3a32be1a8 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon May 31 07:23:32 CEST 2021
+Thu Jun 24 07:23:45 CEST 2021