Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

3de6e3e6

Unverified Commit 3de6e3e6 authored 7 years ago by Diego Sampaio

Downloads
- Plain Diff

Merge branch 'develop' into sidenav-roomlist

parents cb77b33f c52c18f9

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

.meteor/packages 1 addition, 1 deletion

.meteor/packages
.meteor/versions 0 additions, 1 deletion

.meteor/versions
packages/rocketchat-google-natural-language/.npm/package/npm-shrinkwrap.json 4 additions, 4 deletions

...-google-natural-language/.npm/package/npm-shrinkwrap.json
packages/rocketchat-lib/server/models/Rooms.js 12 additions, 0 deletions

packages/rocketchat-lib/server/models/Rooms.js
packages/rocketchat-ui-vrecord/client/VRecDialog.js 5 additions, 5 deletions

packages/rocketchat-ui-vrecord/client/VRecDialog.js
packages/rocketchat-ui/client/lib/chatMessages.coffee 0 additions, 426 deletions

packages/rocketchat-ui/client/lib/chatMessages.coffee

with 22 additions and 437 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