X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=7ec08f73661d5c1504e116996cedbfb539dbeeb0;hp=15b91cc93beaedd2dc0962e3c2d06f6a8b1b5c14;hb=7be0877c0f6578563a106a541357647b888ea1da;hpb=db39fc1518a9f7e66e8f8dc6bffac7fe9c65a442;ds=sidebyside

diff --git a/.tx/merge-base b/.tx/merge-base
index 15b91cc93b..7ec08f7366 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Apr  8 07:24:18 CEST 2020
+Sat May  9 07:23:55 CEST 2020