Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket-Chat
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

5cbab666

Unverified Commit 5cbab666 authored 8 years ago by Gabriel Engel

Downloads
- Plain Diff

Merge branch 'develop'

parents a9f3952c 071b0da4

No related branches found

Tags 0.34.0

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

packages/rocketchat-lib/i18n/ca.i18n.json 2 additions, 2 deletions

packages/rocketchat-lib/i18n/ca.i18n.json
packages/rocketchat-lib/i18n/en.i18n.json 1 addition, 0 deletions

packages/rocketchat-lib/i18n/en.i18n.json
packages/rocketchat-lib/i18n/es.i18n.json 2 additions, 2 deletions

packages/rocketchat-lib/i18n/es.i18n.json
packages/rocketchat-lib/server/models/Users.coffee 1 addition, 13 deletions

packages/rocketchat-lib/server/models/Users.coffee
server/methods/registerUser.coffee 1 addition, 1 deletion

server/methods/registerUser.coffee
server/methods/sendForgotPasswordEmail.coffee 1 addition, 1 deletion

server/methods/sendForgotPasswordEmail.coffee

with 8 additions and 19 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