Merge branch 'master' into room-settings

This commit is contained in:
Ahmad Farhat
2020-04-28 13:12:20 -04:00
committed by GitHub
9 changed files with 29 additions and 9 deletions

View File

@ -162,6 +162,7 @@ en:
delete: Delete
edit: Edit
edit_roles: Edit the user roles
merge: Merge
perm_delete: Permanently Delete
unban: Unban User
undelete: Undelete