Merge branch 'develop' into release-candidate
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 deletionsHISTORY.md
- package.json 1 addition, 1 deletionpackage.json
- packages/rocketchat-api/server/v1/users.js 26 additions, 24 deletionspackages/rocketchat-api/server/v1/users.js
- packages/rocketchat-lib/rocketchat.info 1 addition, 1 deletionpackages/rocketchat-lib/rocketchat.info
Loading
Please register or sign in to comment