Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

770c29c5

Commit 770c29c5 authored 8 years ago by Gabriel Engel

Downloads
- Plain Diff

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

parents a3192013 cc161c9e

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

packages/rocketchat-i18n/i18n/he.i18n.json 79 additions, 66 deletions

packages/rocketchat-i18n/i18n/he.i18n.json
packages/rocketchat-lib/client/lib/cachedCollection.js 1 addition, 1 deletion

packages/rocketchat-lib/client/lib/cachedCollection.js
packages/rocketchat-lib/server/models/Rooms.coffee 2 additions, 2 deletions

packages/rocketchat-lib/server/models/Rooms.coffee
packages/rocketchat-lib/server/models/_BaseCache.js 5 additions, 3 deletions

packages/rocketchat-lib/server/models/_BaseCache.js
packages/rocketchat-lib/server/models/_BaseDb.js 1 addition, 0 deletions

packages/rocketchat-lib/server/models/_BaseDb.js

with 88 additions and 72 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