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

diff --git a/.tx/merge-base b/.tx/merge-base
index 615dd52c3..b9ecf35af 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jul 26 07:24:53 CEST 2020
+Sun Nov 22 07:24:57 CET 2020