Benjamin Smedberg 07b45aaa26 Fix merge conflict bustage for removed file from bug 1307445 part A. ... MozReview-Commit-ID: LQ5tZclbtb6 --HG-- extra : rebase_source : 01447300d41eaa074cf11658ceb8f135c7aeb27e		2016-10-18 09:32:57 -04:00
..
content	Bug 1307445 part A - Don't ever show "A plugin is needed to display this content." or "This plugin is disabled." - Just always use fallback content or empty content. r=mconley+sebastian	2016-10-18 08:42:12 -04:00
jar.mn	Fix merge conflict bustage for removed file from bug 1307445 part A.	2016-10-18 09:32:57 -04:00
moz.build
pluginGlue.manifest	Bug 1307445 part A - Don't ever show "A plugin is needed to display this content." or "This plugin is disabled." - Just always use fallback content or empty content. r=mconley+sebastian	2016-10-18 08:42:12 -04:00