Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

59c2b012

Commit 59c2b012 authored 9 years ago by Rodrigo Nascimento

Downloads
- Plain Diff

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

parents 714ae72f 0b926b0c

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

client/lib/RoomManager.coffee 1 addition, 1 deletion

client/lib/RoomManager.coffee
client/stylesheets/base.less 39 additions, 1 deletion

client/stylesheets/base.less
client/stylesheets/global/_variables.less 1 addition, 1 deletion

client/stylesheets/global/_variables.less
client/views/admin/users/adminUsers.coffee 6 additions, 6 deletions

client/views/admin/users/adminUsers.coffee
client/views/app/room.coffee 5 additions, 14 deletions

client/views/app/room.coffee
client/views/app/userInfo.html 65 additions, 63 deletions

client/views/app/userInfo.html
server/publications/fullUserData.coffee 44 additions, 0 deletions

server/publications/fullUserData.coffee

with 161 additions and 86 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