X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=d39a1e537b98f32267e63dd8d0d72b898aac3412;hb=cec1279555390bc9d77cb3088f7d3499477b249f;hp=5f1d8879099518515079b493a057a28939d335c1;hpb=82d7ab427e32e5825ab91a08afef8e8be1457521;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 5f1d88790..d39a1e537 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Jun  3 07:23:52 CEST 2021
+Sat Jun  5 07:23:46 CEST 2021