Merge "Finish stash uploads with upload dialog"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 11 Apr 2016 16:34:12 +0000 (16:34 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 11 Apr 2016 16:34:12 +0000 (16:34 +0000)
1  2 
resources/Resources.php
resources/src/mediawiki/mediawiki.Upload.BookletLayout.js

Simple merge