Merge branch 'master' into dev

This commit is contained in:
Mike Cao 2020-09-12 04:37:02 -07:00
commit 372f709f95
17 changed files with 641 additions and 1455 deletions

View file

@ -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,
},