X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=a90598bb3f2da203bf2266d3e7ec0b9091d9351f;hp=67a023d4c8fb61a4e1b494e3b59c6d9a00a4f553;hb=af10cd512a39605d9721ad0347ff9734ba56e6d5;hpb=014563bb18d2fca287bd53fbde65b057e4ec6eef

diff --git a/.tx/merge-base b/.tx/merge-base
index 67a023d4c8..a90598bb3f 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Sep 12 07:24:50 CEST 2019
+Tue Jan 14 07:24:53 CET 2020