X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=de2591c13542d3ce6b0e2bb48af7d2e7ffb6a63a;hb=873f1b3ef177d3b290982be4adb3707482b8c6fc;hp=615dd52c39dba7579f266d74008786fbef6b543b;hpb=bd21a4132197b9f76d00278cc629771725047ad6;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 615dd52c3..de2591c13 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jul 26 07:24:53 CEST 2020
+Sun Oct 18 07:24:53 CEST 2020