tree f03f4e235eee57d82d80f0f088eb89393b301256
parent 357ece0d8c2b0924e1a048e1479aa98534958ef0
parent 7148c43d08b6428375295224bce4300bfd3c82e3
author David Pursehouse <dpursehouse@collab.net> 1571289566 +0900
committer David Pursehouse <dpursehouse@collab.net> 1571289566 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade wiremock to 2.25.1

Change-Id: Ib4926324e578f3912e0cb56d00d0aca10081c2b3