tree 94069f69e676fb6ef6f17465e7e5f96e5cca7e71
parent c13700600ad1d4f245f58f159fbb209d93127fb3
parent 6f750fe70bd2079e417dee8454f796ab7ef46ee0
author David Pursehouse <dpursehouse@collab.net> 1548749176 +0900
committer David Pursehouse <dpursehouse@collab.net> 1548749176 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade javamelody-core to 1.76.0

Change-Id: I55c20e40853d55b9c52ed97a932dfa9357595ef0