github/umami
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/umami-software/umami into dev

Browse Source 
# Conflicts:
#	components/messages.js
This commit is contained in:
Mike Cao
2023-04-10 07:25:27 -07:00
parent 94ed67e339 3e1c1a85e4
commit f84e41e198
15 changed files with 84 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/messages.js
View File

@@ -14,7 +14,7 @@ export const labels = defineMessages({
password: { id: 'label.password', defaultMessage: 'Password' },
role: { id: 'label.role', defaultMessage: 'Role' },
user: { id: 'label.user', defaultMessage: 'User' },
admin: { id: 'label.administrator', defaultMessage: 'Administrator' },
admin: { id: 'label.admin', defaultMessage: 'Administrator' },
confirm: { id: 'label.confirm', defaultMessage: 'Confirm' },
details: { id: 'label.details', defaultMessage: 'Details' },
websites: { id: 'label.websites', defaultMessage: 'Websites' },