Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

f690933e

Commit f690933e authored 9 years ago by Aaron

Downloads
- Plain Diff

Merge branch 'master' of github.com:RocketChat/Rocket.Chat

parents d02a8751 a40bbbcc

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

client/lib/avatar.coffee 2 additions, 0 deletions

client/lib/avatar.coffee
client/stylesheets/base.less 40 additions, 2 deletions

client/stylesheets/base.less
client/views/app/messagePopup.coffee 25 additions, 9 deletions

client/views/app/messagePopup.coffee
client/views/app/messagePopupConfig.coffee 9 additions, 3 deletions

client/views/app/messagePopupConfig.coffee
client/views/app/messagePopupUser.html 4 additions, 0 deletions

client/views/app/messagePopupUser.html
packages/rocketchat-markdown/markdown.coffee 1 addition, 1 deletion

packages/rocketchat-markdown/markdown.coffee
server/publications/onlineUsers.coffee 43 additions, 0 deletions

server/publications/onlineUsers.coffee

with 124 additions and 15 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 sign in to comment