Merge branch 'develop' into regression/fix-multi-instance-apps
Showing
- packages/chatpal-search/client/template/admin.html 1 addition, 0 deletionspackages/chatpal-search/client/template/admin.html
- packages/chatpal-search/package.js 0 additions, 1 deletionpackages/chatpal-search/package.js
- packages/chatpal-search/server/asset/chatpal-logo-icon-darkblue.svg 1 addition, 1 deletion...hatpal-search/server/asset/chatpal-logo-icon-darkblue.svg
- packages/chatpal-search/server/asset/chatpal-logo-icon-lightblue.svg 0 additions, 15 deletions...atpal-search/server/asset/chatpal-logo-icon-lightblue.svg
- packages/chatpal-search/server/asset/config.js 0 additions, 1 deletionpackages/chatpal-search/server/asset/config.js
- packages/rocketchat-api/server/v1/settings.js 2 additions, 1 deletionpackages/rocketchat-api/server/v1/settings.js
- packages/rocketchat-apps/package.js 1 addition, 1 deletionpackages/rocketchat-apps/package.js
- packages/rocketchat-apps/server/converters/messages.js 18 additions, 4 deletionspackages/rocketchat-apps/server/converters/messages.js
- packages/rocketchat-apps/server/converters/users.js 10 additions, 5 deletionspackages/rocketchat-apps/server/converters/users.js
- packages/rocketchat-i18n/i18n/de.i18n.json 2 additions, 1 deletionpackages/rocketchat-i18n/i18n/de.i18n.json
- packages/rocketchat-i18n/i18n/en.i18n.json 1 addition, 0 deletionspackages/rocketchat-i18n/i18n/en.i18n.json
- packages/rocketchat-lib/server/functions/deleteMessage.js 4 additions, 4 deletionspackages/rocketchat-lib/server/functions/deleteMessage.js
- packages/rocketchat-search/client/search/search.js 3 additions, 1 deletionpackages/rocketchat-search/client/search/search.js
- packages/rocketchat-ui-flextab/client/tabs/membersList.js 1 addition, 1 deletionpackages/rocketchat-ui-flextab/client/tabs/membersList.js
- packages/rocketchat-ui-sidenav/client/sidebarHeader.js 2 additions, 2 deletionspackages/rocketchat-ui-sidenav/client/sidebarHeader.js
Loading
Please register or sign in to comment