X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;fp=.tx%2Fmerge-base;h=5f1d8879099518515079b493a057a28939d335c1;hp=a7a5dfbddb5c22ef7f16bbc99e18215b752347cf;hb=b6f9e655f492175956d506b751eba3b0d64ddec9;hpb=ed93b758d53ebc676ca58c660cb1f1dee4816504

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