[chromium-freeworld/f27: 36/37] Merge branch 'master' into f27
commit 4a3f8b52cb3613673e9287306f4beffc15b373b5
Merge: e3c17c3 a367efa
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Oct 4 16:58:16 2018 -0400
Merge branch 'master' into f27
.gitignore | 1 +
chromium.spec | 8 +++++---
sources | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---