Merge pull request #1903 from SoftCreatR/dislikestuf

author Marcel Werk <burntime@woltlab.com>

Fri, 1 Jul 2016 15:59:57 +0000 (17:59 +0200)

committer GitHub <noreply@github.com>

Fri, 1 Jul 2016 15:59:57 +0000 (17:59 +0200)
author Marcel Werk <burntime@woltlab.com>
Fri, 1 Jul 2016 15:59:57 +0000 (17:59 +0200)
committer GitHub <noreply@github.com>
Fri, 1 Jul 2016 15:59:57 +0000 (17:59 +0200)
diff --cc wcfsetup/install/files/js/WCF.User.js
Simple merge
diff --cc wcfsetup/install/lang/de.xml
Simple merge
diff --cc wcfsetup/install/lang/en.xml
Simple merge
author	Marcel Werk <burntime@woltlab.com>
	Fri, 1 Jul 2016 15:59:57 +0000 (17:59 +0200)
committer	GitHub <noreply@github.com>
	Fri, 1 Jul 2016 15:59:57 +0000 (17:59 +0200)
		1	2
wcfsetup/install/files/js/WCF.User.js	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