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

Update master #163

Merged
merged 3 commits into from
Aug 4, 2015
Merged

Update master #163

merged 3 commits into from
Aug 4, 2015

Conversation

edunham
Copy link
Member

@edunham edunham commented Aug 4, 2015

Merged rust-lang/rust-www branch gh-pages into rust-lang/rust-www branch master. This is the last step before we can inform github that master is the real master branch and turn off github pages for this repo.

Context: #148

brson and others added 3 commits August 4, 2015 15:09
Master is the real master branch now, but gh-pages had some new content.
@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @pcwalton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. The way Github handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive
Copy link

warning Warning warning

  • Pull requests are usually filed against the gh-pages branch for this repo, but this one is against master. Please double check that you specified the right target!

alexcrichton added a commit that referenced this pull request Aug 4, 2015
@alexcrichton alexcrichton merged commit 7332b74 into rust-lang:master Aug 4, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants