Merge pull request #3476 from WoltLab/failsafe-scss

author Joshua Rüsweg <ruesweg@woltlab.com>

Mon, 17 Aug 2020 14:24:29 +0000 (16:24 +0200)

committer GitHub <noreply@github.com>

Mon, 17 Aug 2020 14:24:29 +0000 (16:24 +0200)
author Joshua Rüsweg <ruesweg@woltlab.com>
Mon, 17 Aug 2020 14:24:29 +0000 (16:24 +0200)
committer GitHub <noreply@github.com>
Mon, 17 Aug 2020 14:24:29 +0000 (16:24 +0200)
diff --cc wcfsetup/install/files/acp/templates/styleAdd.tpl
Simple merge
diff --cc wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
Simple merge
diff --cc wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php
Simple merge
diff --cc wcfsetup/install/lang/de.xml
Simple merge
diff --cc wcfsetup/install/lang/en.xml
Simple merge
author	Joshua Rüsweg <ruesweg@woltlab.com>
	Mon, 17 Aug 2020 14:24:29 +0000 (16:24 +0200)
committer	GitHub <noreply@github.com>
	Mon, 17 Aug 2020 14:24:29 +0000 (16:24 +0200)
		1	2
wcfsetup/install/files/acp/templates/styleAdd.tpl	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/acp/form/StyleEditForm.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