Merge branch 'dev' of...

Merge branch 'dev' of https://gitlab.liu.se/tddd96-grupp11/teknikattan-scoring-system into 84-wrong-number-of-competitions-in-dashboard

client/src/pages/admin/users/UserManager.tsx

@@ -181,7 +181,7 @@ const UserManager: React.FC = (props: any) => {
               ))}
           </TableBody>
         </Table>
-        {(!users || users.length === 0) && <Typography>Inga tävlingar hittades med nuvarande filter</Typography>}
+        {(!users || users.length === 0) && <Typography>Inga användare hittades med nuvarande filter</Typography>}
       </TableContainer>
       <TablePagination
         component="div"