Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add unstable book to the bookshelf #40154

Merged
merged 2 commits into from
Mar 9, 2017

Conversation

steveklabnik
Copy link
Member

@GuillaumeGomez
Copy link
Member

Thanks!

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Feb 28, 2017

📌 Commit 3aa6f18 has been approved by GuillaumeGomez

src/doc/index.md Outdated
@@ -42,6 +43,7 @@ landed before then. That work is being tracked [here][38643].
[ref]: reference/index.html
[38643]: https://github.com/rust-lang/rust/issues/38643
[err]: error-index.html
[book]: book/index.html
[unstable-book]: book/index.html
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't look right...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sigh, thanks

@frewsxcv
Copy link
Member

@bors r-

@steveklabnik
Copy link
Member Author

fixed up, ready for another review

@frewsxcv
Copy link
Member

frewsxcv commented Mar 2, 2017

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 2, 2017

📌 Commit ae2c9d2 has been approved by frewsxcv

@GuillaumeGomez
Copy link
Member

@bors: retry

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 3, 2017
@bors
Copy link
Contributor

bors commented Mar 4, 2017

⌛ Testing commit ae2c9d2 with merge 834ef01...

@bors
Copy link
Contributor

bors commented Mar 4, 2017

💔 Test failed - status-travis

@frewsxcv
Copy link
Member

frewsxcv commented Mar 4, 2017

@bors retry

@bors
Copy link
Contributor

bors commented Mar 4, 2017

🔒 Merge conflict

@frewsxcv
Copy link
Member

frewsxcv commented Mar 6, 2017

@bors retry

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 6, 2017
@bors
Copy link
Contributor

bors commented Mar 6, 2017

🔒 Merge conflict

@frewsxcv
Copy link
Member

frewsxcv commented Mar 6, 2017

@bors retry

@bors
Copy link
Contributor

bors commented Mar 6, 2017

🔒 Merge conflict

@steveklabnik
Copy link
Member Author

Why does bors think there's merge conflicts?

@steveklabnik
Copy link
Member Author

@bors: retry

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Mar 7, 2017
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 8, 2017
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 8, 2017
arielb1 pushed a commit to arielb1/rust that referenced this pull request Mar 8, 2017
bors added a commit that referenced this pull request Mar 9, 2017
@bors bors merged commit ae2c9d2 into rust-lang:master Mar 9, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants