tree e93ce95f2307f84f2d434011f910c0e9e1eac7d2
parent a016c7bd44d2abd8da3e28974d9c692de453bd69
parent c366225a835b27c2a24f9dd940962008d4022aa4
author Paladox none <thomasmulhall410@yahoo.com> 1628008374 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1628008374 +0000

Merge changes Icc7c6387,Icf9a3cc8

* changes:
  Convert gr-diff-preferences_test.js to typescript
  Fix template problems with gr-diff-preferences