Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…

…nto rocketchat-ui2
RocketChat · Apr 28, 2017 · 522f737 · 522f737
2 parents dae37ec + 58c2e46
commit 522f737
Show file tree

Hide file tree

Showing 44 changed files with 1,453 additions and 1,154 deletions.
diff --git a/packages/rocketchat-lib/client/MessageAction.coffee b/packages/rocketchat-lib/client/MessageAction.coffee