Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

e24a31ee

Commit e24a31ee authored 9 years ago by Rafael Caferati

Downloads
- Plain Diff

Merge branch 'pr/261'

Conflicts:
	client/views/app/privateHistory.html
	client/views/app/room.html
	client/views/app/settings.html

parents 77cb5acc 2e2be359

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

client/stylesheets/base.less 28 additions, 22 deletions

client/stylesheets/base.less
client/views/app/home.html 7 additions, 9 deletions

client/views/app/home.html
client/views/app/layout.html 1 addition, 1 deletion

client/views/app/layout.html
client/views/app/privateHistory.html 8 additions, 0 deletions

client/views/app/privateHistory.html
client/views/app/room.html 14 additions, 0 deletions

client/views/app/room.html
client/views/app/settings.html 13 additions, 0 deletions

client/views/app/settings.html
client/views/app/sideNav/userStatus.html 1 addition, 3 deletions

client/views/app/sideNav/userStatus.html

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