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

diff --git a/.tx/merge-base b/.tx/merge-base
index 15b91cc93..0f66bdb55 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Apr  8 07:24:18 CEST 2020
+Wed Jun 17 07:23:49 CEST 2020