Merge remote-tracking branch 'origin/master' into waltermitty

This commit is contained in:
Jake Moshenko 2014-09-12 11:45:07 -04:00
commit b55e79e5d3
6 changed files with 93 additions and 12 deletions

View file

@ -77,7 +77,7 @@
<span class="container-content build-log-phase" phase="container"></span>
</div>
<div ng-switch-when="error">
<span class="container-content build-log-error" error="container"></span>
<span class="container-content build-log-error" error="container" entries="logEntries"></span>
</div>
<div ng-switch-when="command">
<span class="container-content build-log-command" command="container"></span>