Merge branch 'origin/master' into 'origin/1.0'

This commit is contained in:
David Tolnay 2017-04-13 10:19:35 -07:00
commit afd080d005
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82

View File

@ -15,10 +15,15 @@ You may be looking for:
## Serde in action
<a href="http://play.integer32.com/?gist=9003c5b88c1f4989941925d7190c6eec" target="_blank">
<img align="right" width="50" src="https://raw.githubusercontent.com/serde-rs/serde-rs.github.io/master/img/run.png">
</a>
```rust
#[macro_use]
extern crate serde_derive;
extern crate serde;
extern crate serde_json;
#[derive(Serialize, Deserialize, Debug)]