Merge branch 'master' into next
authorTim Düsterhus <tim@bastelstu.be>
Wed, 2 Oct 2019 22:25:21 +0000 (00:25 +0200)
committerTim Düsterhus <tim@bastelstu.be>
Wed, 2 Oct 2019 22:25:21 +0000 (00:25 +0200)
commit33ea490f11ff9500a47262fae5f4a749cae98f62
treedd6702e51008bff15897f54d12278390c998a10f
parent87b579b8fefe6a600acd8ea9851b555e93e7b870
parent818f970763a07ebf1521cede37330469c112e817
Merge branch 'master' into next
files/lib/system/exporter/XF2xExporter.class.php
language/de.xml
language/en.xml