Merge branch 'master' into next

author Tim Düsterhus <duesterhus@woltlab.com>

Thu, 13 Sep 2018 13:57:49 +0000 (15:57 +0200)

committer Tim Düsterhus <duesterhus@woltlab.com>

Thu, 13 Sep 2018 13:57:49 +0000 (15:57 +0200)
author Tim Düsterhus <duesterhus@woltlab.com>
Thu, 13 Sep 2018 13:57:49 +0000 (15:57 +0200)
committer Tim Düsterhus <duesterhus@woltlab.com>
Thu, 13 Sep 2018 13:57:49 +0000 (15:57 +0200)
diff --cc com.woltlab.wcf/page.xml
Simple merge
diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js
Simple merge
diff --cc wcfsetup/install/files/lib/page/MembersListPage.class.php
Simple merge
diff --cc wcfsetup/install/lang/de.xml
Simple merge
diff --cc wcfsetup/install/lang/en.xml
Simple merge
author	Tim Düsterhus <duesterhus@woltlab.com>
	Thu, 13 Sep 2018 13:57:49 +0000 (15:57 +0200)
committer	Tim Düsterhus <duesterhus@woltlab.com>
	Thu, 13 Sep 2018 13:57:49 +0000 (15:57 +0200)
		1	2
com.woltlab.wcf/page.xml	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/page/MembersListPage.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/de.xml	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/en.xml	patch \|	diff1 \|	diff2 \|	blob \| history