X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=26b89722f27d171f3351c8191a7b21ecd89e9dc8;hb=7293b54a1803fd869181c26dddfcc06e013f9644;hp=cd219015e0f591882df5a91ee121bec4d0ddfd32;hpb=61421d2958f71b39107cb77914adb85cb6e1e543;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index cd219015e..26b89722f 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Apr 10 07:23:20 CEST 2021
+Tue Jul 20 07:23:32 CEST 2021