[chromium-freeworld: 12/32] Merge branch 'master' into f26
commit 17957347c00ee4bd7c369ea830ea7d950bf4fa1f
Merge: cf44702 c558cc1
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Mar 5 12:18:29 2018 -0500
Merge branch 'master' into f26
.gitignore | 1 +
chromium.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---