Merge "Make "/*@noflip*/ /*@embed*/" annotation work"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 29 Aug 2014 19:45:06 +0000 (19:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 29 Aug 2014 19:45:06 +0000 (19:45 +0000)
commit08e50bcecd32e6646b2a07a356517feb733aad78
tree18ac650fd53b28f2e78d930a2850a5201bbd7407
parent87d5dac86bf1aafa48cc1c78ef465242a87adc37
parent2d842f14250646475b5c2ffa2fe4f5a131f94236
Merge "Make "/*@noflip*/ /*@embed*/" annotation work"
includes/OutputPage.php
includes/resourceloader/ResourceLoaderFileModule.php