X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=0f66bdb55a5d0e2300d2af049369b3623069f0ca;hp=1fa00aae1cd07a859ff1dd080aecf1f676ec0995;hb=a197e3dc0066cd81b37f42d3bacaa2cd8382cd3f;hpb=f452ebe1b7857a5a54f13bc59bc873596dc5b69a

diff --git a/.tx/merge-base b/.tx/merge-base
index 1fa00aae1..0f66bdb55 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Oct 17 07:24:27 CEST 2019
+Wed Jun 17 07:23:49 CEST 2020