Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop
Showing
- i18n/en.i18n.json 1 addition, 0 deletionsi18n/en.i18n.json
- packages/rocketchat-otr/client/rocketchat.otr.js 14 additions, 11 deletionspackages/rocketchat-otr/client/rocketchat.otr.js
- packages/rocketchat-otr/client/rocketchat.otr.room.js 167 additions, 240 deletionspackages/rocketchat-otr/client/rocketchat.otr.room.js
- packages/rocketchat-otr/client/views/otrFlexTab.html 1 addition, 1 deletionpackages/rocketchat-otr/client/views/otrFlexTab.html
- packages/rocketchat-otr/client/views/otrFlexTab.js 15 additions, 7 deletionspackages/rocketchat-otr/client/views/otrFlexTab.js
- packages/rocketchat-ui/lib/chatMessages.coffee 28 additions, 25 deletionspackages/rocketchat-ui/lib/chatMessages.coffee
- packages/rocketchat-ui/lib/notification.coffee 16 additions, 14 deletionspackages/rocketchat-ui/lib/notification.coffee
Please register or sign in to comment