Merge branch 'master' into '1.0'

Conflicts:
    serde/src/macros.rs
This commit is contained in:
David Tolnay committed 2017-04-05 15:10:18 -07:00
commit a7f6ad137a
4 files changed
+4 -19

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "serde_test"
version = "0.9.12"
version = "0.9.13"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0"
description = "Token De/Serializer for testing De/Serialize implementations"