Skip to content
This repository was archived by the owner on Sep 30, 2020. It is now read-only.

Commit ae80c2d

Browse files
34428535613442853561
authored
Merge pull request #1 from rust-lang/master
17.2.3.0.57
2 parents 63dc185 + c5c0754 commit ae80c2d

34 files changed

+343
-147
lines changed

‎_data/users.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,11 @@
282282
url: http://www.trafficland.com/
283283
logo: trafficland.svg
284284
how: "Video transcoding, manipulation, and analysis."
285+
-
286+
name: Wire
287+
url: https://wire.com
288+
logo: Wire.png
289+
how: "Wire's Axolotl protocol implementation and other cryptographic and utility libraries are developed in Rust, then cross-compiled for iOS and Android."
285290
-
286291
name: Xero
287292
url: https://www.xero.com

‎_includes/friends.js‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
function swapDiv(e1, e2){
2+
var e1p = e1.parentNode;
3+
var e2p = e2.parentNode;
4+
var e2s = e2.nextSibling;
5+
6+
e1p.replaceChild(e2, e1);
7+
if (e2s) {
8+
e2p.insertBefore(e1, e2s);
9+
} else {
10+
e2p.appendChild(e1);
11+
}
12+
}
13+
14+
function shuffle() {
15+
var friends = document.querySelectorAll(".friend");
16+
for (var i = 0; i < friends.length; i++) {
17+
var r1 = Math.floor(Math.random() * friends.length);
18+
var r2 = Math.floor(Math.random() * friends.length);
19+
swapDiv(friends[r1], friends[r2]);
20+
}
21+
}
22+
23+
shuffle();

‎_includes/rustup.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ function detect_platform() {
3333
if (os == "unknown") {
3434
if (navigator.appVersion.indexOf("Win")!=-1) {os = "win";}
3535
if (navigator.appVersion.indexOf("Mac")!=-1) {os = "unix";}
36+
// rust-www/#692 - FreeBSD epiphany!
37+
if (navigator.appVersion.indexOf("FreeBSD")!=-1) {os = "unix";}
3638
}
3739

3840
return os;

‎_includes/set_platform.js‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎_layouts/basic.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ <h2><a href="/en-US/contribute.html">Contribute</a></h2>
4747
<a href="/zh-CN/">简体中文</a>,
4848
<a href="/it-IT/">Italiano</a>
4949
<a href="/vi-VN/">Tiếng việt</a>,
50-
<a href="/zh-CN/">简体中文</a>
5150
</p>
5251
</footer>
5352

‎_layouts/fr-FR/basic.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@ <h2><a href="/fr-FR/contribute.html">Contribuer</a></h2>
4343
<a href="/ko-KR/">한국어</a>,
4444
<a href="/pt-BR/">Português</a>,
4545
<a href="/ru-RU/">Русский</a>,
46-
<a href="/zh-CN/">简体中文</a>,
4746
<a href="/it-IT/">Italiano</a>
48-
<a href="/vi-VN/">Tiếng việt</a>,
47+
<a href="/vi-VN/">Tiếng việt</a>,
4948
<a href="/zh-CN/">简体中文</a>
5049
</p>
5150
</footer>

‎_layouts/ko-KR/basic.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ <h2><a href="/ko-KR/contribute.html">기여하기</a></h2>
4343
<a href="/ja-JP/">日本語</a>,
4444
<a href="/pt-BR/">Português</a>,
4545
<a href="/ru-RU/">Русский</a>,
46-
<a href="/zh-CN/">简体中文</a>,
4746
<a href="/it-IT/">Italiano</a>
4847
<a href="/vi-VN/">Tiếng việt</a>,
4948
<a href="/zh-CN/">简体中文</a>

‎_layouts/pt-BR/basic.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ <h2><a href="/pt-BR/contribute.html">Contribua</a></h2>
4343
<a href="/ja-JP/">日本語</a>,
4444
<a href="/ko-KR/">한국어</a>,
4545
<a href="/ru-RU/">Русский</a>,
46-
<a href="/zh-CN/">简体中文</a>,
4746
<a href="/it-IT/">Italiano</a>
4847
<a href="/vi-VN/">Tiếng việt</a>,
4948
<a href="/zh-CN/">简体中文</a>

‎_layouts/ru-RU/basic.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ <h2><a href="/ru-RU/contribute.html">Участие</a></h2>
4343
<a href="/ja-JP/">日本語</a>,
4444
<a href="/ko-KR/">한국어</a>,
4545
<a href="/pt-BR/">Português</a>,
46-
<a href="/zh-CN/">简体中文</a>,
4746
<a href="/it-IT/">Italiano</a>
4847
<a href="/vi-VN/">Tiếng việt</a>,
4948
<a href="/zh-CN/">简体中文</a>

‎_layouts/zh-CN/basic.html‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,12 @@ <h2><a href="/zh-CN/contribute.html">贡献</a></h2>
4040
<p>本土化页面：
4141
<a href="/en-US/">English</a>,
4242
<a href="/fr-FR/">Français</a>,
43-
<a href="/ja-JP/">日本語</a>,
43+
<a href="/ja-JP/">日本語</a>,
4444
<a href="/ko-KR/">한국어</a>,
4545
<a href="/pt-BR/">Português</a>,
4646
<a href="/ru-RU/">Русский</a>,
47-
<<<<<<< HEAD
48-
<a href="/it-IT/">Italiano</a>
49-
=======
47+
<a href="/it-IT/">Italiano</a>,
5048
<a href="/vi-VN/">Tiếng việt</a>
51-
>>>>>>> upstream/master
5249
</p>
5350
</footer>
5451

0 commit comments

Comments
 (0)