X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=ccb93bf8271b4f1df35db01588a04ed03f32e49c;hb=47ec8202d51bcd12b727f12b9dca09b1927e6187;hp=05ada6be4cd19f6c7375fe650c43dda3fb54f03b;hpb=05878d3a4c3285af636dd5e9f9b3aa1f54e6b3fb;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 05ada6be4..ccb93bf82 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Aug 27 07:23:20 CEST 2021
+Sat Nov  6 07:23:23 CET 2021