Merge "mw.Upload.BookletLayout: Better handle error messages from AbuseFilter and...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 11 Jul 2016 19:38:51 +0000 (19:38 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 11 Jul 2016 19:38:51 +0000 (19:38 +0000)
1  2 
languages/i18n/en.json
languages/i18n/qqq.json
resources/Resources.php

Simple merge
Simple merge
Simple merge