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

diff --git a/.tx/merge-base b/.tx/merge-base
index 390d38fad..76b49b82a 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jun  3 07:23:37 CEST 2020
+Wed Jun 24 07:23:44 CEST 2020