summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Rudolph <johannes.rudolph@gmail.com>2014-03-13 09:59:08 +0100
committerJohannes Rudolph <johannes.rudolph@gmail.com>2014-03-13 09:59:08 +0100
commit63b95d7a2abfc964fc477dbf6024184cbba83224 (patch)
treecc9634a01e386458300fefd78d2c1aebb8e5b56c
parent6d29e6e22a36e2f0ce2b7308d6a75c5204c33b50 (diff)
parentfcd630b41b7cdf932abdfeb995de88355836aca2 (diff)
downloadspray-json-63b95d7a2abfc964fc477dbf6024184cbba83224.tar.gz
spray-json-63b95d7a2abfc964fc477dbf6024184cbba83224.tar.bz2
spray-json-63b95d7a2abfc964fc477dbf6024184cbba83224.zip
Merge pull request #95 from NicholasSterling/master
Change Spray Conversions diagram: asJson => parseJson
-rw-r--r--images/Conversions.pngbin27540 -> 27833 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/images/Conversions.png b/images/Conversions.png
index 8e75acc..fd73b1a 100644
--- a/images/Conversions.png
+++ b/images/Conversions.png
Binary files differ