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

Merge remote-tracking branch 'origin/develop' into fix-reactions-you

# Conflicts:
#	packages/rocketchat-ui-message/client/message.coffee
parents 89d7d8bb bf092520
No related branches found
No related tags found
No related merge requests found
Showing
with 879 additions and 582 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