tree 83166ef702e35e574c80808ccddea5a8727a7331
parent 00504d88af70d301899634ad11f996d5da1f3e2d
parent cdf199e2c5e7bd65b83c05f5d39a75da773effe8
author Marco Miller <marco.miller@ericsson.com> 1594836702 -0400
committer Marco Miller <marco.miller@ericsson.com> 1594836702 -0400

Merge branch 'stable-3.1'

* stable-3.1:
  Upgrade javamelody-core to 1.85.0

Change-Id: Ie20fa97c9358a5cd494ad87d8a4dc56c7ec9a406