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

Merge remote-tracking branch 'origin/release-candidate' into develop

# Conflicts:
#	.docker/Dockerfile
#	.scripts/set-version.js
#	packages/rocketchat-google-natural-language/.npm/package/npm-shrinkwrap.json
parents 2d132473 b16650f6
No related branches found
No related tags found
No related merge requests found
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