X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=4db976c5932279ccfcdd18884c3e39c07cba2dd2;hb=c7f837c4e37c3887acb0a4463438d433758afab5;hp=1ea9b48ff6d43f552d78885dd7349171f65544a7;hpb=923cc586b5d994cc9658cdf7343549a9893e968f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 1ea9b48ff..4db976c59 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Nov 10 07:23:43 CET 2020
+Sat Nov 14 07:23:44 CET 2020