X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=c614fa7e78ec17ef79be76b7e4260ac5f191232b;hb=7ef5256bd60312032dd264fa702546e8644cd4c2;hp=008f8814a40c9752828eb43bb2f04af05a5d7a73;hpb=8ed3353314a7a50059c3856005a0f933cfa806b7;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 008f8814a..c614fa7e7 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jan  5 07:23:57 CET 2021
+Sun Jun  6 07:24:56 CEST 2021