Merge commit 'c5a35e388ca2ab34937b654c09129b05d91982dc'

Browse Source

# Conflicts:
#	serde2/serde2_macros/src/lib.rs

...

This commit is contained in:

Erick Tryzelaar committed 2015-03-03 17:55:18 -08:00

2 parents 1182ad0223 c5a35e388c

commit 033b039284

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available