pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-13 17:11:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
    serde/Cargo.toml
    serde/src/de/impls.rs
    serde/src/ser/impls.rs
    serde_derive/Cargo.toml
    serde_test/Cargo.toml
This commit is contained in:
David Tolnay
2017-04-17 14:18:33 -07:00
parent faaf5ee115 d4d2061a2e
commit a778425d0f
7 changed files with 214 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_test/Cargo.toml
+6
View File
@@ -1,6 +1,12 @@
[package]
name = "serde_test"
<<<<<<< HEAD
version = "0.9.13" # remember to update html_root_url
||||||| merged common ancestors
version = "0.9.13"
=======
version = "0.9.14"
>>>>>>> origin/master
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0"
description = "Token De/Serializer for testing De/Serialize implementations"