tree a9fcea9ca1d38c0e6968adee4e78d5fa13cbc6b9
parent d985a83e2e65a68c9f58065bbb747e337673df76
parent 8f80c85187293d654b732e8fe59eee888809d653
author David Pursehouse <dpursehouse@collab.net> 1567168166 +0900
committer David Pursehouse <dpursehouse@collab.net> 1567168166 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Fix base url in addHTML to correctly match
  Add base url to addHTML

Change-Id: I5aa62e6832349a7ff232d46dccb652255de5bc8e