Merge branch 'master' into DefaultUser/trigger_cleanup

[xonotic/xonotic-data.pk3dir.git] / .tx / merge-base

diff --git a/.tx/merge-base b/.tx/merge-base
index e8b76ebee4ea4e22d60947f6b55edcc44cd5b78c..f60d2b8f88b73fa9b90c0e97acacb0922b866b6e 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon May 15 07:23:51 CEST 2017
+Mon Mar  5 07:23:48 CET 2018