Merge pull request #3403 from WoltLab/media_file_replacement

author Matthias Schmidt <gravatronics@live.com>

Mon, 6 Jul 2020 16:01:06 +0000 (18:01 +0200)

committer GitHub <noreply@github.com>

Mon, 6 Jul 2020 16:01:06 +0000 (18:01 +0200)
author Matthias Schmidt <gravatronics@live.com>
Mon, 6 Jul 2020 16:01:06 +0000 (18:01 +0200)
committer GitHub <noreply@github.com>
Mon, 6 Jul 2020 16:01:06 +0000 (18:01 +0200)
diff --cc wcfsetup/install/lang/de.xml
Simple merge
diff --cc wcfsetup/install/lang/en.xml
Simple merge
diff --cc wcfsetup/setup/db/install.sql
Simple merge
author	Matthias Schmidt <gravatronics@live.com>
	Mon, 6 Jul 2020 16:01:06 +0000 (18:01 +0200)
committer	GitHub <noreply@github.com>
	Mon, 6 Jul 2020 16:01:06 +0000 (18:01 +0200)
		1	2
wcfsetup/install/lang/de.xml	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/en.xml	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/setup/db/install.sql	patch \|	diff1 \|	diff2 \|	blob \| history