Erick Tryzelaar 42b8b6153e Merge branch 'v0.6.x' into master ...

# Conflicts:
#	serde/Cargo.toml
#	serde/src/ser/impls.rs
#	serde_codegen/src/attr.rs
#	serde_codegen/src/de.rs
#	serde_codegen/src/field.rs
#	serde_codegen/src/ser.rs

2016-01-18 12:45:39 -08:00

..

macros.rs

Refactor tests to not use serde_json

2015-08-29 17:29:42 -07:00

test_annotations.rs

s/disallow_unknown/deny_unknown_fields/

2016-01-11 10:20:07 -08:00

test_bytes.rs

Merge pull request #162 from skade/std-error

2015-12-08 14:10:45 -05:00

test_de.rs

Merge branch 'v0.6.x' into master

2016-01-18 12:45:39 -08:00

test_macros.rs

Refactor tests to not use serde_json

2015-08-29 17:29:42 -07:00

test_ser.rs

feat(clippy): Use clippy for it's extra lints

2016-01-18 12:24:03 -08:00

test.rs

feat(clippy): Use clippy for it's extra lints

2016-01-18 12:24:03 -08:00

test.rs.in

Refactor tests to not use serde_json

2015-08-29 17:29:42 -07:00

token.rs

Merge branch 'v0.6.x' into master

2016-01-18 12:45:39 -08:00