Commit 70a3daa2 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '1.5.x'

parents 3b0fb970 bca96932
......@@ -121,4 +121,7 @@ do as they were designed before this was clarified.
| http://square.github.io/okhttp/[OkHttp]
| https://github.com/freefair/okhttp-spring-boot
| https://github.com/membrane/service-proxy[Membrane Service Proxy]
| https://github.com/helpermethod/membrane-spring-boot-starter
|===
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