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

diff --git a/.tx/merge-base b/.tx/merge-base
index 5b06a0a0c..22fa57672 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jun 13 07:23:44 CEST 2020
+Thu Aug 20 07:23:42 CEST 2020