X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=25aec9d460c9e902d48c89b007064a6500007437;hp=76b17ee0d96cbfc3d0e9f6020d21617e2e0f24b3;hb=5934e5ea9e6f26b1c51cffd40aa3ae3344d79532;hpb=92ed00b08d16fb73df84c6aaf5e24cf4fe71d7c5

diff --git a/.tx/merge-base b/.tx/merge-base
index 76b17ee0d9..25aec9d460 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed May 13 07:23:38 CEST 2020
+Mon Jul 13 07:23:53 CEST 2020