X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=5737ecab2b51f47cab38994c1787e89d3111dce6;hb=f3bc9bf3c871a6303784a11b2bcf06be9f124479;hp=366518820ffdfe5ff5f5799c6798a46637446315;hpb=a00da67baa28814fe328ede2523e718c8e708844;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 366518820..5737ecab2 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jul  8 07:23:47 CEST 2020
+Fri Oct  9 07:23:35 CEST 2020