Merge branch '5.2'

author Alexander Ebert <ebert@woltlab.com>

Sat, 3 Oct 2020 10:57:21 +0000 (12:57 +0200)

committer Alexander Ebert <ebert@woltlab.com>

Sat, 3 Oct 2020 10:57:21 +0000 (12:57 +0200)
author Alexander Ebert <ebert@woltlab.com>
Sat, 3 Oct 2020 10:57:21 +0000 (12:57 +0200)
committer Alexander Ebert <ebert@woltlab.com>
Sat, 3 Oct 2020 10:57:21 +0000 (12:57 +0200)
diff --cc files/lib/system/exporter/PhpBB31xExporter.class.php
Simple merge
diff --cc files/lib/system/exporter/SMF2xExporter.class.php
Simple merge
author	Alexander Ebert <ebert@woltlab.com>
	Sat, 3 Oct 2020 10:57:21 +0000 (12:57 +0200)
committer	Alexander Ebert <ebert@woltlab.com>
	Sat, 3 Oct 2020 10:57:21 +0000 (12:57 +0200)
		1	2
files/lib/system/exporter/PhpBB31xExporter.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
files/lib/system/exporter/SMF2xExporter.class.php	patch \|	diff1 \|	diff2 \|	blob \| history