X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=1ee7cdb840b5e5535b405de0d0d8c246c5c47b00;hb=c317f0d00edc77e264836beb56865dbe0adac4e8;hp=ea315e72f89d2edfb539db5cb53b31f7f3bf9b4c;hpb=9a04df193299873a8133651e4579dbfc2253b717;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index ea315e72f..1ee7cdb84 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri May 29 07:23:43 CEST 2020
+Tue Aug 25 07:23:38 CEST 2020