diff options
| author | bors <bors@rust-lang.org> | 2016-05-15 18:22:51 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-05-15 18:22:51 -0700 |
| commit | bb39c4925a792b1dbb2bfa0323339fdf4297c4ac (patch) | |
| tree | 5e6fe8318fc1c313fb09be3f7989f0222ab302c3 /src/doc | |
| parent | 5ebe41835fcc3dbfdbe282a9b4c3780968c0a97a (diff) | |
| parent | ffbfbe452c29b6fb92836862f4b5b31383b4ef0c (diff) | |
| download | rust-bb39c4925a792b1dbb2bfa0323339fdf4297c4ac.tar.gz rust-bb39c4925a792b1dbb2bfa0323339fdf4297c4ac.zip | |
Auto merge of #33643 - eddyb:rollup, r=eddyb
Rollup of 27 pull requests - Successful merges: #33342, #33393, #33415, #33475, #33517, #33533, #33534, #33565, #33580, #33584, #33585, #33588, #33590, #33591, #33593, #33598, #33600, #33602, #33603, #33604, #33605, #33607, #33612, #33620, #33633, #33634, #33635 - Failed merges: #33578
Diffstat (limited to 'src/doc')
| -rw-r--r-- | src/doc/footer.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/footer.inc b/src/doc/footer.inc index b5eb589eb53..952846dd5e2 100644 --- a/src/doc/footer.inc +++ b/src/doc/footer.inc @@ -1,7 +1,7 @@ <footer><p> Copyright © 2011-2015 The Rust Project Developers. Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> -or the <a href="http://opensource.org/licenses/MIT">MIT license</a>, at your option. +or the <a href="https://opensource.org/licenses/MIT">MIT license</a>, at your option. </p><p> This file may not be copied, modified, or distributed except according to those terms. </p></footer> |