Merge branch 'master' into f26

This commit is contained in:
Troy Dawson 2017-06-05 14:45:58 -07:00
commit a9d7ce570e

View file

@ -143,6 +143,10 @@ data:
fbset,
# fedora-logos
fedora-logos, fedora-logos-httpd,
#fedora-modular-release
fedora-modular-release,
#fedora-modular-repos
fedora-modular-repos,
# fedora-rpm-macros
fedora-rpm-macros,
# fedpkg-minimal
@ -829,7 +833,10 @@ data:
ref: 51b6ae97396524f39038b361db2f04e35e6a9664
fedora-modular-release:
rationale: Autogenerated by Base Runtime tools.
ref: 0bb0e0dbf358825eeddfc10ce0ece2915c90b2f8
ref: db937d42cebde417a4002ed2ce8578c63f2b114c
fedora-modular-repos:
rationale: Autogenerated by Base Runtime tools.
ref: c1f4b61a43f5123fec07b926c23e99c8732ea951
# fedora-rpm-macros-26-2.fc26
fedora-rpm-macros:
rationale: Autogenerated by Base Runtime tools.