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

diff --git a/.tx/merge-base b/.tx/merge-base
index 07d09242df..a90598bb3f 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jun 25 07:24:50 CEST 2019
+Tue Jan 14 07:24:53 CET 2020