Skip to content
Snippets Groups Projects
Commit 9440f1af authored by Gabriel Engel's avatar Gabriel Engel
Browse files

Merge branch 'develop' into admin-info

Conflicts:
	i18n/en.i18n.json
	packages/rocketchat-ui-admin/admin/adminInfo.html
parents 342637e1 a072c691
No related merge requests found
Showing
with 208 additions and 174 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment