forked from External/greenlight
		
	Merge branch 'master' into room-settings
This commit is contained in:
		@@ -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
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user