X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=fea366fda43b57e0369624503c24402708d9b2e8;hp=31c765fff004dbbefe7bb7ba7d5ddfd87b6dea9f;hb=57a3d14a7469e931c7419ee5d12db8cba1417c22;hpb=63c408dcb19d5e14be4ee312ea67b44a94459e45

diff --git a/.tx/merge-base b/.tx/merge-base
index 31c765fff..fea366fda 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jun 20 07:25:04 CEST 2021
+Mon Jun 21 07:23:43 CEST 2021