tree cd0684ef9e18897b1b0ac1a0dd2a769bb16a16ed
parent 61382628c31656494725f3aed4e4dc326bea0b6b
parent 330d25f552bfae2ffc6b195be43b38dd9c6c4f97
author David Pursehouse <dpursehouse@collab.net> 1543301821 +0900
committer David Pursehouse <dpursehouse@collab.net> 1543301821 +0900

Merge branch 'stable-2.15'

* stable-2.15:
  Fix invalid json in REST documentation

Change-Id: I6ed6f44e2a47cc9d4088d0ab9e4ea6f529e38d95