commit 011a5c09f7974f4bdb24548d241f1900bb142a5f Merge: 3fb8d2c 3763861 Author: Jens Petersen <[email protected]> Date: Wed Dec 24 14:32:23 2014 +0900
Merge remote-tracking branch 'origin' into f21
Conflicts:
google-noto-fonts.spec
google-noto-fonts.spec | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
_______________________________________________
fonts-bugs mailing list
[email protected]
https://admin.fedoraproject.org/mailman/listinfo/fonts-bugs
http://fonts.fedoraproject.org/
