diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-06-06 07:45:43 -0500 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-06-06 07:45:43 -0500 |
commit | 493f96b9ab73d41286407a78930f481a6f1b94e9 (patch) | |
tree | d0a636aee9d7dfa013a7fb5b314a9777b01b9b6c /components/servo/main.rs | |
parent | 458a5324618b8e58565d686fdea3363a31e11973 (diff) | |
parent | 57f575b5ca62fab1bce80eea7061f59fdd5586da (diff) | |
download | servo-493f96b9ab73d41286407a78930f481a6f1b94e9.tar.gz servo-493f96b9ab73d41286407a78930f481a6f1b94e9.zip |
Auto merge of #6291 - Ms2ger:caption, r=nox
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6291)
<!-- Reviewable:end -->
Diffstat (limited to 'components/servo/main.rs')
0 files changed, 0 insertions, 0 deletions