Merge "maintenance: Have update-oojs-ui.sh update composer.json too"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 10 Jan 2015 01:36:53 +0000 (01:36 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 10 Jan 2015 01:36:53 +0000 (01:36 +0000)

Trivial merge