Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2017-05-12 09:11:45 +02:00
commit e9ec0584ab
1 changed files with 1 additions and 1 deletions

View File

@ -122,6 +122,6 @@ do as they were designed before this was clarified.
| https://github.com/freefair/okhttp-spring-boot
| https://github.com/membrane/service-proxy[Membrane Service Proxy]
| https://github.com/helpermethod/membrane-spring-boot-starter
| https://github.com/membrane/membrane-spring-boot-starter
|===