Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2017-05-09 08:35:18 +02:00
commit 70a3daa266
1 changed files with 3 additions and 0 deletions

View File

@ -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
|===