Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2019-04-06 10:00:51 +08:00
commit ed1b356dfa
19 changed files with 13 additions and 305 deletions

View file

@ -316,7 +316,7 @@ var ProcessHangMonitor = {
nb.appendNotification(bundle.getString("processHang.label"),
"process-hang",
"chrome://browser/content/aboutRobots-icon.png",
"chrome://browser/skin/slowStartup-16.png",
nb.PRIORITY_WARNING_HIGH, buttons);
},