summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jakob@odersky.com>2019-08-01 22:50:25 +0100
committerJakob Odersky <jakob@odersky.com>2019-08-01 22:50:25 +0100
commit025725b960bb02383a3237cfa221320b7658b41b (patch)
tree5c3d6d479e5c7ae51af49983b3c22984fa1c5530
parentb97d9b4be7d57b16e9d2faa8998d87ecde75fd35 (diff)
downloadspray-json-025725b960bb02383a3237cfa221320b7658b41b.tar.gz
spray-json-025725b960bb02383a3237cfa221320b7658b41b.tar.bz2
spray-json-025725b960bb02383a3237cfa221320b7658b41b.zip
update readme
-rw-r--r--README.markdown4
1 files changed, 3 insertions, 1 deletions
diff --git a/README.markdown b/README.markdown
index 911cec7..b819873 100644
--- a/README.markdown
+++ b/README.markdown
@@ -2,7 +2,9 @@
[![Download](https://img.shields.io/maven-central/v/io.crashbox/spray-json_2.12.svg)](https://search.maven.org/#search|ga|1|io.crashbox%20spray-json-)
*This repository is a fork of the spray-json project. Its purpose is
-to make spray available for ScalaJS and ScalaNative.*
+to make spray available for ScalaJS and ScalaNative. As of August 2019,
+the changes by this fork have been merged back into the original spray-json
+project.*
*It remains fully binary compatible with the upstream project and can
be used as a drop-in replacement on the JVM.*