Merge m-c to fx-team on a CLOSED TREE.

This commit is contained in:
Ryan VanderMeulen 2014-09-17 16:38:12 -04:00
commit 7e275ee131

View File

@ -43,6 +43,7 @@ skip-if = e10s # Bug 915547 (social providers don't install)
skip-if = e10s # Bug 915547 (social providers don't install)
[browser_social_errorPage.js]
[browser_social_flyout.js]
skip-if = e10s # when we backed out bug 1047603, this test broke.
[browser_social_isVisible.js]
[browser_social_marks.js]
skip-if = e10s # Bug 915547 (social providers don't install)