Merge branch 'develop' into feature/react-admin

2021-03-06 15:37:03 -07:00 · 2021-03-06 15:37:03 -07:00 · 7d80b5fee7
commit 7d80b5fee7
parent f78aaea6a3 0baa74a517
3 changed files with 12 additions and 2 deletions
--- a/resources/scripts/components/dashboard/DashboardContainer.tsx
+++ b/resources/scripts/components/dashboard/DashboardContainer.tsx
@ -35,7 +35,7 @@ export default () => {
            {rootAdmin &&
            <div css={tw`mb-2 flex justify-end items-center`}>
                <p css={tw`uppercase text-xs text-neutral-400 mr-2`}>
-                    {showOnlyAdmin ? 'Showing other\'s servers' : 'Showing your servers'}
+                    {showOnlyAdmin ? 'Showing others\' servers' : 'Showing your servers'}
                </p>
                <Switch
                    name={'show_all_servers'}