[chromium-freeworld/f27: 22/37] Merge branch 'master' into f27
commit 0590af50e5ec47335e6b36fc03a0deb8ec5c57e3
Merge: a94664f 55ffd95
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon May 14 13:03:19 2018 -0400
Merge branch 'master' into f27
.gitignore | 1 +
chromium.spec | 7 ++++++-
sources | 1 +
3 files changed, 8 insertions(+), 1 deletion(-)
---