tree 212cb3812788f129bfcbdcd66ba06ced629af280
parent 4fa34cfbfcd04cce10ec8d595b669e31052de911
parent 9967e1f0dc40e1e403dd7ec899b3b613efffa0f8
author David Pursehouse <dpursehouse@collab.net> 1560592616 +0900
committer David Pursehouse <dpursehouse@collab.net> 1560592616 +0900

Merge branch 'stable-3.0'

* stable-3.0:
  Highlight .mjs as javascript
  Set version to 2.15.15-SNAPSHOT
  Update buildifier to 0.26

Change-Id: I37f28ca8c35980ec61ee12c4c9e24ea602df6cf2