Merge branch '3.0'

author Alexander Ebert <ebert@woltlab.com>

Fri, 27 Apr 2018 16:15:27 +0000 (18:15 +0200)

committer Alexander Ebert <ebert@woltlab.com>

Fri, 27 Apr 2018 16:15:27 +0000 (18:15 +0200)
author Alexander Ebert <ebert@woltlab.com>
Fri, 27 Apr 2018 16:15:27 +0000 (18:15 +0200)
committer Alexander Ebert <ebert@woltlab.com>
Fri, 27 Apr 2018 16:15:27 +0000 (18:15 +0200)
diff --cc wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabSource.js
Simple merge
diff --cc wcfsetup/install/files/lib/page/AbstractArticlePage.class.php
Simple merge
diff --cc wcfsetup/install/files/lib/page/CmsPage.class.php
Simple merge
author	Alexander Ebert <ebert@woltlab.com>
	Fri, 27 Apr 2018 16:15:27 +0000 (18:15 +0200)
committer	Alexander Ebert <ebert@woltlab.com>
	Fri, 27 Apr 2018 16:15:27 +0000 (18:15 +0200)
		1	2
wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabSource.js	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/page/AbstractArticlePage.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/page/CmsPage.class.php	patch \|	diff1 \|	diff2 \|	blob \| history