X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=e43a3376bd7c9ce501c55180aba6ee526dcae448;hb=7f8c19051dadd84ab83cc4eacec6c18c402b9c52;hp=04d7ce13c3e590b566cd520bb8933573712b4292;hpb=b672ee9ae3ff96e9db82d04a0306ecdc19832845;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 04d7ce13c..e43a3376b 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Aug 19 07:23:45 CEST 2020
+Thu Dec 10 07:23:45 CET 2020