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

Commit e5bf17ea authored by Victoria Lease's avatar Victoria Lease
Browse files

resolved conflicts for merge of 25208987 to master 

Change-Id: If900fc2d9892f3ff743d94cb209780047da0110f
parents f9e22aaa 01b67a2a

data/fonts/Roboto-Black.ttf

+4 B (125 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

data/fonts/Roboto-Bold.ttf

+4 B (125 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

data/fonts/Roboto-BoldItalic.ttf

−12 B (131 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

data/fonts/Roboto-Italic.ttf

−8 B (129 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

data/fonts/Roboto-Light.ttf

−4 B (124 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file