tree 206c2f676d85ffb9ca91b1c20959f4099f386d32
parent faf868206bff2ffe9008c61ae25b52b1fce7256a
parent 2f7f0f72fe957d59a803ac43cc22153d87d52d90
author David Pursehouse <dpursehouse@collab.net> 1555394835 +0900
committer David Pursehouse <dpursehouse@collab.net> 1555394835 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade wiremock to 2.23.2

Change-Id: I9dd8080d4fcb59aa69961713249fea66a7f9478b