X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=a7a5dfbddb5c22ef7f16bbc99e18215b752347cf;hb=d7cc4a2b833130ced70835def67a583a27cb7633;hp=e43a3376bd7c9ce501c55180aba6ee526dcae448;hpb=7f8c19051dadd84ab83cc4eacec6c18c402b9c52;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index e43a3376b..a7a5dfbdd 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Dec 10 07:23:45 CET 2020
+Mon May 31 07:23:32 CEST 2021