Merge branch 'v0.6.x'

This commit is contained in:
Erick Tryzelaar committed 2016-02-08 14:17:26 -08:00
commit 46f88037db
8 files changed
+47 -10

No files matched your search

+1 -1
View File
@@ -11,7 +11,7 @@ keywords = ["serialization"]
build = "build.rs"
[features]
nightly = ["clippy", "serde/nightly"]
nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"]
[build-dependencies]
syntex = { version = "^0.26.0" }