Merge branch 'terencehill/hud_notify_panel_update' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index eb8aedc6b9fa321073b1627ff20b8892d8ea0e48..1930c781ed152426833dde069476e73afccda9d0 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat May 22 07:46:39 CEST 2021
+Sun May 23 07:25:48 CEST 2021