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

diff --git a/.tx/merge-base b/.tx/merge-base
index 34a50eb27..c614fa7e7 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Apr  7 07:23:36 CEST 2021
+Sun Jun  6 07:24:56 CEST 2021