Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop
Showing
- i18n/en.i18n.json 14 additions, 11 deletionsi18n/en.i18n.json
- packages/rocketchat-integrations/server/methods/outgoing/updateOutgoingIntegration.coffee 7 additions, 2 deletions.../server/methods/outgoing/updateOutgoingIntegration.coffee
- packages/rocketchat-ldap/config_server.coffee 21 additions, 6 deletionspackages/rocketchat-ldap/config_server.coffee
- packages/rocketchat-ldap/ldap_server.js 24 additions, 0 deletionspackages/rocketchat-ldap/ldap_server.js
- packages/rocketchat-lib/client/lib/openRoom.coffee 1 addition, 0 deletionspackages/rocketchat-lib/client/lib/openRoom.coffee
- packages/rocketchat-lib/server/functions/settings.coffee 3 additions, 0 deletionspackages/rocketchat-lib/server/functions/settings.coffee
- packages/rocketchat-theme/assets/stylesheets/base.less 8 additions, 1 deletionpackages/rocketchat-theme/assets/stylesheets/base.less
- packages/rocketchat-ui-admin/admin/admin.coffee 14 additions, 1 deletionpackages/rocketchat-ui-admin/admin/admin.coffee
- packages/rocketchat-ui-admin/admin/admin.html 1 addition, 1 deletionpackages/rocketchat-ui-admin/admin/admin.html
Loading
Please register or sign in to comment