Merge branch 'martin-t/limit'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 803036b6a9ca294200d18ad67bfe918459f45c82..a43f5bb0f27d7812b48ca6bec11fd18769d38dcf 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Mar  6 07:24:27 CET 2020
+Mon Mar 30 07:24:48 CEST 2020