Merge branch 'terencehill/registry_API' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 803036b6a9ca294200d18ad67bfe918459f45c82..ea315e72f89d2edfb539db5cb53b31f7f3bf9b4c 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Mar  6 07:24:27 CET 2020
+Fri May 29 07:23:43 CEST 2020