X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=e1d1f6fc650b32bb72f0d17f11d8179c1141f4c2;hp=390d38fad8d0f243940dd0d4b36b81e6013501dd;hb=324d1f6b53664199107bdcd2f4959a011c3194bd;hpb=d6d1008a15446f08b274df03013901cd11727a8f

diff --git a/.tx/merge-base b/.tx/merge-base
index 390d38fad..e1d1f6fc6 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jun  3 07:23:37 CEST 2020
+Thu Jun  4 07:23:46 CEST 2020