Merge branch 'master' into next

author Alexander Ebert <ebert@woltlab.com>

Tue, 18 Jun 2019 10:37:16 +0000 (12:37 +0200)

committer Alexander Ebert <ebert@woltlab.com>

Tue, 18 Jun 2019 10:37:16 +0000 (12:37 +0200)
author Alexander Ebert <ebert@woltlab.com>
Tue, 18 Jun 2019 10:37:16 +0000 (12:37 +0200)
committer Alexander Ebert <ebert@woltlab.com>
Tue, 18 Jun 2019 10:37:16 +0000 (12:37 +0200)
diff --cc wcfsetup/install/files/lib/acp/form/LanguageAddForm.class.php
Simple merge
diff --cc wcfsetup/install/files/lib/acp/form/LanguageEditForm.class.php
Simple merge
author	Alexander Ebert <ebert@woltlab.com>
	Tue, 18 Jun 2019 10:37:16 +0000 (12:37 +0200)
committer	Alexander Ebert <ebert@woltlab.com>
	Tue, 18 Jun 2019 10:37:16 +0000 (12:37 +0200)
		1	2
wcfsetup/install/files/lib/acp/form/LanguageAddForm.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/acp/form/LanguageEditForm.class.php	patch \|	diff1 \|	diff2 \|	blob \| history