Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket-Chat
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

7b41b7d1

Unverified Commit 7b41b7d1 authored 8 years ago by Gabriel Engel

Downloads
- Plain Diff

Merge branch 'develop'

parents 4c74f21e f037193a

No related branches found

Tags 0.28.0

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

packages/rocketchat-emojione/emojiPicker.html 12 additions, 9 deletions

packages/rocketchat-emojione/emojiPicker.html
packages/rocketchat-emojione/emojiPicker.js 44 additions, 0 deletions

packages/rocketchat-emojione/emojiPicker.js
packages/rocketchat-emojione/emojiPicker.less 4 additions, 0 deletions

packages/rocketchat-emojione/emojiPicker.less
packages/rocketchat-iframe-login/iframe_client.js 85 additions, 7 deletions

packages/rocketchat-iframe-login/iframe_client.js
packages/rocketchat-iframe-login/iframe_server.js 8 additions, 1 deletion

packages/rocketchat-iframe-login/iframe_server.js
packages/rocketchat-iframe-login/package.js 5 additions, 0 deletions

packages/rocketchat-iframe-login/package.js

with 158 additions and 17 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