Merge branch 'mirceakitsune/fix_damageeffects' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index d15698b68730a588bc9947b1ab0d36958f1fe1c1..ce28e5a3fe814ab19fc5d6828b581665269390e3 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Jul 23 07:24:17 CEST 2018
+Wed Mar 13 07:24:16 CET 2019