Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

33ced377

Commit 33ced377 authored 9 years ago by Rodrigo Nascimento

Downloads
- Plain Diff

Merge branch 'master' into feature/mentions

# Conflicts:
#	client/views/app/chatWindowDashboard.coffee

parents 524917dd 7faf1552

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

.meteor/packages 1 addition, 0 deletions

.meteor/packages
.meteor/platforms 2 additions, 1 deletion

.meteor/platforms
.meteor/versions 1 addition, 0 deletions

.meteor/versions
client/lib/chatMessages.coffee 161 additions, 0 deletions

client/lib/chatMessages.coffee
client/stylesheets/base.less 13 additions, 7 deletions

client/stylesheets/base.less
client/stylesheets/utils/_emojione.import.less 69 additions, 69 deletions

client/stylesheets/utils/_emojione.import.less
client/views/app/chatWindowDashboard.coffee 0 additions, 168 deletions

client/views/app/chatWindowDashboard.coffee
i18n/pt-BR.i18n.json 0 additions, 122 deletions

i18n/pt-BR.i18n.json
i18n/pt.i18n.json 122 additions, 0 deletions

i18n/pt.i18n.json
public/fonts/fontello.html 17 additions, 17 deletions

public/fonts/fontello.html
server/lib/_settings.coffee 0 additions, 2 deletions

server/lib/_settings.coffee
server/startup/i18n-validation.coffee 34 additions, 0 deletions

server/startup/i18n-validation.coffee

with 420 additions and 386 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