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

diff --git a/.tx/merge-base b/.tx/merge-base
index c78952d2d..a49d20e67 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jul 15 07:25:42 CEST 2020
+Sat Jul 25 07:23:37 CEST 2020