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

Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop 

Conflicts:
	packages/rocketchat-lib/server/methods/saveSetting.coffee
parents ccda8a7e d563851e
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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