]> git.lizzy.rs Git - rust.git/commit
rollup merge of #20089: rolftimmermans/json-control-chars-escape
authorAlex Crichton <alex@alexcrichton.com>
Mon, 22 Dec 2014 20:54:32 +0000 (12:54 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Mon, 22 Dec 2014 23:17:22 +0000 (15:17 -0800)
commit8824c39945cf8cbdd0e1a07824e3d2f4823b8e7b
treec6384fcca253dd02b4b3de7f01079184ec63ef86
parent0a07db438be8ce8ce969b1244e8796d65a964d31
parent0a7ef3f6cc7967feeb9c66a4f499ccbd515c67f6
rollup merge of #20089: rolftimmermans/json-control-chars-escape

Conflicts:
src/libserialize/json.rs
src/libserialize/json.rs