X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=76b49b82aad24632754e43d1fa3074656971566d;hb=b7f01d62a12d363e2ad28090b22c208694826ec1;hp=df5f27c1baedba93172f925a324e6ccc1995d9de;hpb=bac31b218e747443d2e4c1f8d6b26b2bb71dddb8;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index df5f27c1b..76b49b82a 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Dec 28 07:24:50 CET 2019
+Wed Jun 24 07:23:44 CEST 2020