Commit 3cf4d75a authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '1.4.x' into 1.5.x

parents baeb9c34 b7d3e91e
......@@ -109,4 +109,7 @@ do as they were designed before this was clarified.
| http://infinispan.org/[Infinispan]
| https://github.com/infinispan/infinispan-spring-boot
| http://square.github.io/okhttp/[OkHttp]
| https://github.com/freefair/okhttp-spring-boot
|===
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment