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

Merge branch 'compacter_messages' of...

Merge branch 'compacter_messages' of https://github.com/lucasvanhalst/Rocket.Chat into lucasvanhalst-compacter_messages

# Conflicts:
#	packages/rocketchat-ui-message/message/message.coffee
parents 059f7fb9 fa3ee544
No related branches found
No related tags found
No related merge requests found
Showing
with 151 additions and 39 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