diff options
| author | Paweł Stawicki <pawelstawicki@gmail.com> | 2017-10-25 10:40:04 +0200 |
|---|---|---|
| committer | Paweł Stawicki <pawelstawicki@gmail.com> | 2017-10-25 10:40:04 +0200 |
| commit | 6aa97fad45999ee95fd42a3c726106b2031bce33 (patch) | |
| tree | 99e73e32341eb3d0f701fbe85b4d8073152f352e /core | |
| parent | 4d010738c7b39b6a3e0844c6831283842d3f220d (diff) | |
| parent | 46318ba2c350a99dcb85015b7a71a5bf70fe854b (diff) | |
| download | sttp-6aa97fad45999ee95fd42a3c726106b2031bce33.tar.gz sttp-6aa97fad45999ee95fd42a3c726106b2031bce33.tar.bz2 sttp-6aa97fad45999ee95fd42a3c726106b2031bce33.zip | |
Merge branch 'master' into stub-match-partial
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/com/softwaremill/sttp/package.scala | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/src/main/scala/com/softwaremill/sttp/package.scala b/core/src/main/scala/com/softwaremill/sttp/package.scala index c1178d9..ed685fa 100644 --- a/core/src/main/scala/com/softwaremill/sttp/package.scala +++ b/core/src/main/scala/com/softwaremill/sttp/package.scala @@ -51,6 +51,7 @@ package object sttp { "application/x-www-form-urlencoded" private[sttp] val TextPlainContentType = "text/plain" private[sttp] val MultipartFormDataContentType = "multipart/form-data" + private[sttp] val ApplicationJsonContentType = "application/json" // entry points |