X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=25aec9d460c9e902d48c89b007064a6500007437;hb=50f099d4c7185489caf387128bbf547b00779b07;hp=ef2b4ce1a7d551e23360d7abe892a82afce85f8c;hpb=1256aab45ebe41e9e107e8ec65a2ecdb9b2b92eb;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index ef2b4ce1a..25aec9d46 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jul  7 07:23:45 CEST 2020
+Mon Jul 13 07:23:53 CEST 2020