Merge branch 'master' into dev

2020-09-12 04:37:02 -07:00
parent 8e3286179a e426524992
commit 372f709f95
17 changed files with 641 additions and 1455 deletions
--- a/components/WebsiteDetails.js
+++ b/components/WebsiteDetails.js
@@ -60,7 +60,7 @@ export default function WebsiteDetails({ websiteId }) {
      component: BrowsersTable,
    },
    {
-      label: <FormattedMessage id="metrics.operating-system" defaultMessage="Operating system" />,
+      label: <FormattedMessage id="metrics.operating-systems" defaultMessage="Operating system" />,
      value: 'os',
      component: OSTable,
    },