Skip to content
Snippets Groups Projects
Commit 01bfddca authored by Rodrigo Nascimento's avatar Rodrigo Nascimento
Browse files

Merge remote-tracking branch 'origin/develop' into EnvironmentConnection 

# Conflicts:
#	packages/rocketchat-lib/package.js
parents 829f9f04 6935e037
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 414 additions and 74 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment