Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

969599a6

Commit 969599a6 authored 7 years ago by Aaron Ogle

Downloads
- Plain Diff

Merge branch 'develop' into release-candidate

parents b66e1bc8 325c7344

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

.docker/Dockerfile 1 addition, 1 deletion

.docker/Dockerfile
.sandstorm/sandstorm-pkgdef.capnp 1 addition, 1 deletion

.sandstorm/sandstorm-pkgdef.capnp
.travis/snap.sh 1 addition, 1 deletion

.travis/snap.sh
HISTORY.md 0 additions, 101 deletions

HISTORY.md
package.json 1 addition, 1 deletion

package.json
packages/rocketchat-api/server/v1/users.js 26 additions, 24 deletions

packages/rocketchat-api/server/v1/users.js
packages/rocketchat-lib/rocketchat.info 1 addition, 1 deletion

packages/rocketchat-lib/rocketchat.info

with 31 additions and 130 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