Merge "Allow putting the app ID in the password for bot passwords"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Tue, 13 Sep 2016 00:38:14 +0000 (00:38 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 13 Sep 2016 00:38:14 +0000 (00:38 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 13 Sep 2016 00:38:14 +0000 (00:38 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 13 Sep 2016 00:38:14 +0000 (00:38 +0000)
diff --cc includes/api/ApiLogin.php
Simple merge
diff --cc includes/specials/SpecialBotPasswords.php
Simple merge
diff --cc includes/user/BotPassword.php
Simple merge
diff --cc languages/i18n/en.json
Simple merge
diff --cc languages/i18n/qqq.json
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 13 Sep 2016 00:38:14 +0000 (00:38 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 13 Sep 2016 00:38:14 +0000 (00:38 +0000)
		1	2
includes/api/ApiLogin.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/specials/SpecialBotPasswords.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/user/BotPassword.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/i18n/en.json	patch \|	diff1 \|	diff2 \|	blob \| history
languages/i18n/qqq.json	patch \|	diff1 \|	diff2 \|	blob \| history