diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-20 02:00:16 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-20 02:00:16 +0530 |
| commit | a129ce1bccf313db85547a5c32ecf8cd7aac489b (patch) | |
| tree | ba704a0135e1414ca1aa0cb12fa19eb72c8cb0bc /components/net/file_loader.rs | |
| parent | 4d5fa963fdcf9ec9287eac762bf6afafdbee5f41 (diff) | |
| parent | eb198d76e7f755d11585158115a0354acd875682 (diff) | |
| download | servo-a129ce1bccf313db85547a5c32ecf8cd7aac489b.tar.gz servo-a129ce1bccf313db85547a5c32ecf8cd7aac489b.zip | |
Auto merge of #10715 - edunham:tidy-licenses, r=larsbergstrom
Allow another wording of apache2/MIT (used by gaol)
r? @larsbergstrom
need this for https://github.com/servo/servo/issues/10636
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10715)
<!-- Reviewable:end -->
Diffstat (limited to 'components/net/file_loader.rs')
0 files changed, 0 insertions, 0 deletions