Merge branch 'martin-t/limit'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index de1b13bbc4bbd2a4a0a99a0aa88b1f9d9c69f101..a43f5bb0f27d7812b48ca6bec11fd18769d38dcf 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Oct  6 07:24:28 CEST 2019
+Mon Mar 30 07:24:48 CEST 2020