X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=8465278c42532c1552876892d696fcf4cad5788a;hp=2a05ab1dfc4d71f704da4e4ddf78b9ccdc64d120;hb=2ec2623bc6da85a7ac9f34a1e5d845a92fb0f18d;hpb=e80a7f5a11fc1cf63ad7130303a89dc78cb807a8;ds=sidebyside

diff --git a/.tx/merge-base b/.tx/merge-base
index 2a05ab1dfc..8465278c42 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Dec 19 07:24:12 CET 2018
+Thu Dec 20 07:24:05 CET 2018