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

diff --git a/.tx/merge-base b/.tx/merge-base
index a720b828c..a7a5dfbdd 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Mar 10 07:24:02 CET 2021
+Mon May 31 07:23:32 CEST 2021