Merge branch 'martin-t/limit'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 0e3c61613bb55ac30cc474cab3c3c640ce25adab..a43f5bb0f27d7812b48ca6bec11fd18769d38dcf 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jul 12 07:24:40 CEST 2019
+Mon Mar 30 07:24:48 CEST 2020