Merge "Ignore phpcs in autoload.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 16 Mar 2015 22:00:51 +0000 (22:00 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 16 Mar 2015 22:00:51 +0000 (22:00 +0000)
1  2 
autoload.php

diff --cc autoload.php
Simple merge