X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=22fa57672fa542f7e727a3c4d319d08c2daf081b;hb=4cec650452119aa747101865fd6c7b793b182f57;hp=dbace8f3926df40fe4b87d148f3cf246cdde2850;hpb=4e33cb428cc26fb337fd789669c289e8db5a0cc6;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index dbace8f39..22fa57672 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun May 31 07:24:59 CEST 2020
+Thu Aug 20 07:23:42 CEST 2020