X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=a49d20e6787f92b4294d463033d5b63561cc714d;hp=25aec9d460c9e902d48c89b007064a6500007437;hb=5249283342ce527435aec14b314a015ec879d7a6;hpb=be255d5426e17de0dc4beb8c423e780ebd9e617b

diff --git a/.tx/merge-base b/.tx/merge-base
index 25aec9d46..a49d20e67 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Jul 13 07:23:53 CEST 2020
+Sat Jul 25 07:23:37 CEST 2020