Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 673e3c28 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev

* commit '178db4d5':
  Add option for serif monospace captioning font
parents 6f451050 178db4d5
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -710,8 +710,9 @@
        <item>Default</item>
        <item>Sans-serif</item>
        <item>Sans-serif condensed</item>
        <item>Sans-serif monospace</item>
        <item>Serif</item>
        <item>Monospace</item>
        <item>Serif monospace</item>
        <item>Casual</item>
        <item>Cursive</item>
        <item>Small capitals</item>
@@ -722,8 +723,9 @@
        <item></item>
        <item>sans-serif</item>
        <item>sans-serif-condensed</item>
        <item>sans-serif-monospace</item>
        <item>serif</item>
        <item>monospace</item>
        <item>serif-monospace</item>
        <item>casual</item>
        <item>cursive</item>
        <item>sans-serif-smallcaps</item>