Merge branch 'sev/lumaIcons' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 5df3cc1a3a63589557d7c5fe6acacd72b076301f..ba83f7ff83e3ef8a77b7601b135a4f3940a7dd77 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Apr 18 07:23:50 CEST 2018
+Tue Jul 10 07:24:23 CEST 2018