From: bors <bors@rust-lang.org>
Date: Tue, 8 Nov 2016 13:01:19 +0000 (-0800)
Subject: Auto merge of #3270 - brson:cargo-docs, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~13^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a8510bb2ef4c5623972b14700bf0b64d628ba42b;p=cargo.git

Auto merge of #3270 - brson:cargo-docs, r=alexcrichton

Revert "Continuously publish Cargo builds"

This reverts commit 7799014dc7330445f62e2f925573ca15dd8e8e03.

Fixes https://github.com/rust-lang/cargo/issues/3269.

The reason doc.crates.io doesn't display correctly is that travis-cargo writes its own index.html that is just a meta-redirect to the api docs, overwriting cargo's own docs.

r? @alexcrichton
---

a8510bb2ef4c5623972b14700bf0b64d628ba42b