Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

c6aec506

Commit c6aec506 authored 9 years ago by Marcelo Schmidt

Downloads
- Plain Diff

Merge branch 'gmsecrieru-master'

# Conflicts:
#	client/routes/roomRoute.coffee

parents bbb81bb6 f9bb0c49

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

client/methods/openRoom.coffee 11 additions, 0 deletions

client/methods/openRoom.coffee
client/routes/roomRoute.coffee 5 additions, 1 deletion

client/routes/roomRoute.coffee
client/views/app/sideNav/listPrivateGroupsFlex.coffee 19 additions, 0 deletions

client/views/app/sideNav/listPrivateGroupsFlex.coffee
client/views/app/sideNav/listPrivateGroupsFlex.html 27 additions, 0 deletions

client/views/app/sideNav/listPrivateGroupsFlex.html
client/views/app/sideNav/privateGroups.coffee 4 additions, 0 deletions

client/views/app/sideNav/privateGroups.coffee
client/views/app/sideNav/privateGroups.html 1 addition, 0 deletions

client/views/app/sideNav/privateGroups.html
i18n/en.i18n.json 2 additions, 0 deletions

i18n/en.i18n.json
i18n/pt.i18n.json 2 additions, 0 deletions

i18n/pt.i18n.json
server/methods/openRoom.coffee 13 additions, 0 deletions

server/methods/openRoom.coffee

with 84 additions and 1 deletion

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