tree 80631c5c3a2b75afb7012677e2ff36a70a245bcf
parent d7986736e5c34097fad09bea0c88edf399abf683
parent e0339bc5628e9b7ecce723f792d9854ca1ece585
author Paladox <thomasmulhall410@yahoo.com> 1575297581 +0000
committer Paladox <thomasmulhall410@yahoo.com> 1575297581 +0000

Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: Ibd10aaa205b9e721ac5dde8b99c29f0ff0870d83