Skip to content
Snippets Groups Projects
Commit 0231db98 authored by Diego Sampaio's avatar Diego Sampaio
Browse files

Merge branch 'develop' into livechat-popout

Conflicts:
	packages/rocketchat-livechat/app/client/views/room.coffee
parents 4e5c8413 3930c7ab
No related branches found
No related tags found
Loading
Showing
with 345 additions and 129 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