Skip to content
Unverified Commit 1c8e44f6 authored by Rodrigo Nascimento's avatar Rodrigo Nascimento
Browse files

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

# Conflicts:
#	package-lock.json
#	packages/rocketchat-livechat/.app/package-lock.json
#	packages/rocketchat-livechat/.app/package.json
#	packages/rocketchat-livechat/package.js
#	packages/rocketchat-theme/client/imports/components/popout.css
#	packages/rocketchat-theme/client/main.css
#	packages/rocketchat-ui/client/views/app/popout.html
#	packages/rocketchat-ui/client/views/app/popout.js
#	packages/rocketchat-ui/package.js
parents cd58e8ee 2dc012ac
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