Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into globals/livechat-g…
Browse files Browse the repository at this point in the history 
…lobal

# Conflicts:
#	packages/rocketchat-livechat/server/api/v1/visitor.js
#	packages/rocketchat-livechat/server/lib/QueueMethods.js
#	packages/rocketchat-livechat/server/methods/takeInquiry.js
  • Loading branch information
@rodrigok
rodrigok committed Feb 15, 2019
2 parents db2928f + ec1b753 commit 88d843c
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 88d843c

Please sign in to comment.