tree 4f81c84c399622271f229a0e25f30cc661c257cf
parent 1a6bfca262f0c9dd351f0e8f0f9c09c661ce8c50
parent 3ec1221b0dce213504c363686e414e5a38236dcd
author Paladox <thomasmulhall410@yahoo.com> 1575297555 +0000
committer Paladox <thomasmulhall410@yahoo.com> 1575297555 +0000

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Fix loading font-roboto-local in the ui

Change-Id: Iedabf7dea6502a3a77183d489f5d17cb00a7215e