X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;fp=.tx%2Fmerge-base;h=95b356d2f75965b4d6ce75040cc92ad1e5eea705;hp=008f8814a40c9752828eb43bb2f04af05a5d7a73;hb=44aa2a489d3490da5e6abbc6fa5fa8c90ab26710;hpb=8ed3353314a7a50059c3856005a0f933cfa806b7

diff --git a/.tx/merge-base b/.tx/merge-base
index 008f8814a4..95b356d2f7 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jan  5 07:23:57 CET 2021
+Fri Jan  8 07:23:48 CET 2021