tree d52c9f1dcd4e3f3f1af5322ba7a8787ccda45580
parent b959ccbaa8f419d2030e74801eb915f83e4cd21a
parent 481f7162b7ac9b3aad441346905d96abb2bda294
author Marco Miller <marco.miller@ericsson.com> 1594832425 -0400
committer Marco Miller <marco.miller@ericsson.com> 1594832425 -0400

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Upgrade javamelody-core to 1.85.0

Change-Id: I5e2803deea56e92b9c605839bd01d7a80bb88411