Merge branch '3.0'

author Marcel Werk <burntime@woltlab.com>

Mon, 15 Apr 2019 14:06:43 +0000 (16:06 +0200)

committer Marcel Werk <burntime@woltlab.com>

Mon, 15 Apr 2019 14:06:43 +0000 (16:06 +0200)
author Marcel Werk <burntime@woltlab.com>
Mon, 15 Apr 2019 14:06:43 +0000 (16:06 +0200)
committer Marcel Werk <burntime@woltlab.com>
Mon, 15 Apr 2019 14:06:43 +0000 (16:06 +0200)
diff --cc wcfsetup/install/files/lib/data/tag/TagCloudTag.class.php
Simple merge
diff --cc wcfsetup/install/files/lib/system/tagging/TagCloud.class.php
Simple merge
author	Marcel Werk <burntime@woltlab.com>
	Mon, 15 Apr 2019 14:06:43 +0000 (16:06 +0200)
committer	Marcel Werk <burntime@woltlab.com>
	Mon, 15 Apr 2019 14:06:43 +0000 (16:06 +0200)
		1	2
wcfsetup/install/files/lib/data/tag/TagCloudTag.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/tagging/TagCloud.class.php	patch \|	diff1 \|	diff2 \|	blob \| history