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

Commit 3b61394

Browse files
authored
Merge pull request #24 from rust-lang/master
17.7.25.1.49
2 parents 1ed7039 + 3bf3e28 commit 3b61394

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+4618
-2950
lines changed

_config.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
name: The Rust Programming Language
2-
stable: "1.18.0"
3-
stable_date: "2017-06-08"
4-
stable_blog: "https://blog.rust-lang.org/2017/06/08/Rust-1.18.html"
5-
stable_full_version: "rustc 1.18.0 (03fc9d622 2017-06-06)"
6-
beta: "1.19"
7-
beta_date: "2017-07-20"
8-
nightly: "1.20"
2+
stable: "1.19.0"
3+
stable_date: "2017-07-20"
4+
stable_blog: "https://blog.rust-lang.org/2017/07/20/Rust-1.19.html"
5+
stable_full_version: "rustc 1.19.0 (0ade33941 2017-07-17)"
6+
beta: "1.20"
7+
beta_date: "2017-08-31"
8+
nightly: "1.21"
99
channels:
1010
- name: "stable"
11-
vers: "1.18.0"
12-
package: "1.18.0"
11+
vers: "1.19.0"
12+
package: "1.19.0"
1313
- name: "beta"
14-
vers: "1.19"
14+
vers: "1.20"
1515
package: "beta"
1616
- name: "nightly"
17-
vers: "1.20"
17+
vers: "1.21"
1818
package: "nightly"

_data/team.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ people:
2828
alexcrichton:
2929
name: Alex Crichton
3030
irc: acrichto
31+
ashleygwilliams:
32+
name: Ashley Williams
33+
irc: agdubs
3134
aturon:
3235
name: Aaron Turon
3336
badboy:
@@ -130,6 +133,8 @@ people:
130133
QuietMisdreavus:
131134
name: QuietMisdreavus
132135
irc: misdreavus
136+
sebasmagri:
137+
name: Sebastián Magrí
133138
sfackler:
134139
name: Steven Fackler
135140
shepmaster:
@@ -204,7 +209,7 @@ teams:
204209
- name: Community team
205210
responsibility: "coordinating events, outreach, commercial users, teaching materials, and exposure"
206211
lead: erickt
207-
members: [brson, edunham, skade, manishearth, johannhof, carols10cents, badboy, booyaa, bstrie, erickt, jonathandturner]
212+
members: [brson, edunham, skade, manishearth, johannhof, sebasmagri, carols10cents, badboy, booyaa, bstrie, erickt, jonathandturner, ashleygwilliams]
208213
209214
- name: Documentation team
210215
responsibility: "ensuring Rust has fantastic documentation"

0 commit comments

Comments
 (0)