Merge branch 'master' into '1.0'

Conflicts:
    serde/src/macros.rs
This commit is contained in:
David Tolnay
2017-04-05 15:10:18 -07:00
4 changed files with 4 additions and 19 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "serde_derive"
version = "0.9.12"
version = "0.9.13"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0"
description = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"