client/views/admin/adminUsers.coffee · cc72938814876bed8c66fa556efcb46e6d49271b · RocketChat / Rocket.Chat · GitLab

Snippets Groups Projects

"README.md" did not exist on "133a07189f1e1a43aa123ec2188be72e3563506b"

9 years ago
6dc4ce7f
Merge branch 'master' into settings-users · 6dc4ce7f
Marcelo Schmidt authored 9 years ago
```
Conflicts:
	client/views/admin/adminUsers.coffee
```
6dc4ce7f

History
Merge branch 'master' into settings-users
Marcelo Schmidt authored 9 years ago
```
Conflicts:
	client/views/admin/adminUsers.coffee
```