Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

fd96e2a0

Unverified Commit fd96e2a0 authored 6 years ago by Diego Sampaio Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge pull request #11536 from RocketChat/develop-sync

Merge master into develop & Set version to 0.68.0-develop

parents 3e419e02 e8f783bd

No related branches found

No related tags found

No related merge requests found

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.docker/Dockerfile.rhel 5 additions, 1 deletion

.docker/Dockerfile.rhel
.github/history.json 264 additions, 0 deletions

.github/history.json
.sandstorm/sandstorm-pkgdef.capnp 2 additions, 2 deletions

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

.travis/snap.sh
HISTORY.md 81 additions, 447 deletions

HISTORY.md
package.json 1 addition, 1 deletion

package.json
packages/rocketchat-lib/rocketchat.info 1 addition, 1 deletion

packages/rocketchat-lib/rocketchat.info

with 355 additions and 453 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