Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

dc2f95f8

Commit dc2f95f8 authored 9 years ago by George Secrieru

Downloads
- Plain Diff

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

parents 55d9b111 a96095c3

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

client/lib/RoomHistoryManager.coffee 5 additions, 3 deletions

client/lib/RoomHistoryManager.coffee
client/lib/RoomManager.coffee 6 additions, 4 deletions

client/lib/RoomManager.coffee
client/lib/readMessages.coffee 24 additions, 5 deletions

client/lib/readMessages.coffee
client/routes/roomRoute.coffee 3 additions, 2 deletions

client/routes/roomRoute.coffee
client/views/app/room.coffee 0 additions, 1 deletion

client/views/app/room.coffee
client/views/loading.html 16 additions, 33 deletions

client/views/loading.html
packages/rocketchat-lib/client/Notifications.coffee 1 addition, 1 deletion

packages/rocketchat-lib/client/Notifications.coffee
packages/rocketchat-lib/server/Notifications.coffee 1 addition, 1 deletion

packages/rocketchat-lib/server/Notifications.coffee

with 56 additions and 50 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