Merge "Change mid-upload 'cancel' button to 'back'"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 26 Sep 2016 18:54:19 +0000 (18:54 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 26 Sep 2016 18:54:19 +0000 (18:54 +0000)
1  2 
languages/i18n/en.json
languages/i18n/qqq.json
resources/Resources.php

Simple merge
Simple merge
Simple merge