Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

73a31220

Commit 73a31220 authored 9 years ago by Diego Sampaio

Downloads
- Plain Diff

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

parents c68fa0eb e76baf59

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

packages/rocketchat-lib/server/publications/settings.coffee 1 addition, 1 deletion

packages/rocketchat-lib/server/publications/settings.coffee
packages/rocketchat-ui-admin/admin/admin.coffee 4 additions, 0 deletions

packages/rocketchat-ui-admin/admin/admin.coffee
packages/rocketchat-ui-admin/admin/admin.html 8 additions, 3 deletions

packages/rocketchat-ui-admin/admin/admin.html

with 13 additions and 4 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