Skip to content
Snippets Groups Projects
Unverified Commit a521920b authored by Marcelo Schmidt's avatar Marcelo Schmidt
Browse files

Merge branch 'develop' into remove-room-from-setting

# Conflicts:
#	packages/rocketchat-ui-admin/client/admin.coffee
parents 11d18717 866e2de9
No related branches found
No related tags found
No related merge requests found
Showing
with 962 additions and 566 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