Merge branch 'master' into f24

This commit is contained in:
Jan Horak 2017-03-29 20:46:40 +02:00
commit b55fb7fb38

View File

@ -785,6 +785,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{mozappdir}/browser/features/e10srollout@mozilla.org.xpi
%{mozappdir}/browser/features/firefox@getpocket.com.xpi
%{mozappdir}/browser/features/webcompat@mozilla.org.xpi
%{mozappdir}/browser/features/deployment-checker@mozilla.org.xp
# That's Windows only
%ghost %{mozappdir}/browser/features/aushelper@mozilla.org.xpi
%attr(644, root, root) %{mozappdir}/browser/blocklist.xml