Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

945d6e54

Commit 945d6e54 authored 8 years ago by Gabriel Engel

Downloads
- Plain Diff

Merge pull request #3166 from pitamar/develop

Combined Hightlight & Markdown packages. Fixed Katex & markdown collision

parents c0dbfea0 93a4ec4c

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

.meteor/packages 0 additions, 1 deletion

.meteor/packages
.meteor/versions 0 additions, 1 deletion

.meteor/versions
packages/rocketchat-highlight/package.js 0 additions, 18 deletions

packages/rocketchat-highlight/package.js
packages/rocketchat-katex/katex.coffee 19 additions, 4 deletions

packages/rocketchat-katex/katex.coffee
packages/rocketchat-markdown/markdown.coffee 2 additions, 15 deletions

packages/rocketchat-markdown/markdown.coffee
packages/rocketchat-markdown/markdowncode.coffee 85 additions, 0 deletions

packages/rocketchat-markdown/markdowncode.coffee
packages/rocketchat-markdown/package.js 15 additions, 9 deletions

packages/rocketchat-markdown/package.js
packages/rocketchat-ui-message/message/messageBox.coffee 3 additions, 3 deletions

packages/rocketchat-ui-message/message/messageBox.coffee
packages/rocketchat-ui-message/message/messageBox.html 2 additions, 2 deletions

packages/rocketchat-ui-message/message/messageBox.html

with 126 additions and 53 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