Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

07d8d9d8

Unverified Commit 07d8d9d8 authored 6 years ago by Bradley Hilton Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge pull request #10376 from RocketChat/develop-sync

Master into Develop Branch Sync

parents c29fd84b 7ea39a76

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

.circleci/config.yml 1 addition, 1 deletion

.circleci/config.yml
.docker/Dockerfile 1 addition, 1 deletion

.docker/Dockerfile
.github/history.json 81 additions, 1 deletion

.github/history.json
.sandstorm/sandstorm-pkgdef.capnp 1 addition, 1 deletion

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

.travis/snap.sh
HISTORY.md 35 additions, 48 deletions

HISTORY.md
package-lock.json 1 addition, 1 deletion

package-lock.json
package.json 1 addition, 1 deletion

package.json
packages/rocketchat-katex/package-lock.json 7 additions, 8 deletions

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

packages/rocketchat-lib/rocketchat.info

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