Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 0 insertions, 26 deletions

diff --git a/browser/base/content/pageinfo/pageInfo.css b/browser/base/content/pageinfo/pageInfo.css
deleted file mode 100644
index 622b56bb5..000000000
--- a/browser/base/content/pageinfo/pageInfo.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-#viewGroup > radio {
-  -moz-binding: url("chrome://browser/content/pageinfo/pageInfo.xml#viewbutton");
-}
-
-richlistitem[feed] {
-  -moz-binding: url("chrome://browser/content/pageinfo/feeds.xml#feed");
-}
-
-richlistitem[feed]:not([selected="true"]) .feed-subscribe {
-  display: none;
-}
-
-groupbox[closed="true"] > .groupbox-body { 
-  visibility: collapse;
-}
-
-#thepreviewimage {
-  display: block;
-/* This following entry can be removed when Bug 522850 is fixed. */
-  min-width: 1px;
-}