Backed out changeset cad376d2e71f (bug 1218908) for blocking m-c to fx-team merge...
commit55a9d343e566ba70a0e4d076abc0cdd4a8b9a9ec
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 29 Oct 2015 11:12:42 +0000 (29 12:12 +0100)
committerCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 29 Oct 2015 11:12:42 +0000 (29 12:12 +0100)
treea714076bb3352944069a36f07dcdebe30f5a7688
parent2981471089a1d68db51fd515afef0fd4484dcd27
Backed out changeset cad376d2e71f (bug 1218908) for blocking m-c to fx-team merge with a conflict
browser/components/preferences/in-content/content.js
browser/components/preferences/in-content/content.xul
browser/locales/en-US/chrome/browser/preferences/content.dtd
browser/themes/shared/incontentprefs/preferences.inc.css