Commit e9ec0584 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '1.5.x'

parents 5f339fcb 4e973127
......@@ -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
|===
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