X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=99d127cbd61dbcc4cf809204e97c02d821d74f9e;hb=dfeb73bcd0f3a285d34f0bf85ae16762ff97e890;hp=0b4e832800ada01d1fc9e633af055ce5716806eb;hpb=f87b9a379f2418ff37032302ac094038ae4a970f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 0b4e83280..99d127cbd 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jun  5 07:23:39 CEST 2020
+Sat Jun  6 07:23:41 CEST 2020