Merge branch 'develop' into feature/read-only-rooms
# Conflicts: # packages/rocketchat-authorization/server/startup.coffee
No related branches found
No related tags found
Showing
- client/startup/unread.coffee 1 addition, 0 deletionsclient/startup/unread.coffee
- packages/rocketchat-authorization/server/startup.coffee 52 additions, 52 deletionspackages/rocketchat-authorization/server/startup.coffee
- packages/rocketchat-file-upload/server/methods/sendFileMessage.js 1 addition, 1 deletion.../rocketchat-file-upload/server/methods/sendFileMessage.js
- packages/rocketchat-lib/i18n/en.i18n.json 3 additions, 1 deletionpackages/rocketchat-lib/i18n/en.i18n.json
- packages/rocketchat-lib/server/functions/sendMessage.coffee 1 addition, 1 deletionpackages/rocketchat-lib/server/functions/sendMessage.coffee
- packages/rocketchat-lib/server/lib/notifyUsersOnMessage.js 4 additions, 0 deletionspackages/rocketchat-lib/server/lib/notifyUsersOnMessage.js
- packages/rocketchat-lib/server/lib/sendEmailOnMessage.js 4 additions, 0 deletionspackages/rocketchat-lib/server/lib/sendEmailOnMessage.js
- packages/rocketchat-lib/server/methods/sendMessage.coffee 10 additions, 0 deletionspackages/rocketchat-lib/server/methods/sendMessage.coffee
- packages/rocketchat-mapview/client/mapview.coffee 3 additions, 2 deletionspackages/rocketchat-mapview/client/mapview.coffee
- private/moment-locales/af.js 9 additions, 8 deletionsprivate/moment-locales/af.js
- private/moment-locales/ar-ma.js 9 additions, 7 deletionsprivate/moment-locales/ar-ma.js
- private/moment-locales/ar-sa.js 8 additions, 6 deletionsprivate/moment-locales/ar-sa.js
- private/moment-locales/ar-tn.js 9 additions, 7 deletionsprivate/moment-locales/ar-tn.js
- private/moment-locales/ar.js 10 additions, 8 deletionsprivate/moment-locales/ar.js
- private/moment-locales/az.js 10 additions, 8 deletionsprivate/moment-locales/az.js
- private/moment-locales/be.js 36 additions, 48 deletionsprivate/moment-locales/be.js
- private/moment-locales/bg.js 17 additions, 16 deletionsprivate/moment-locales/bg.js
- private/moment-locales/bn.js 24 additions, 17 deletionsprivate/moment-locales/bn.js
- private/moment-locales/bo.js 19 additions, 9 deletionsprivate/moment-locales/bo.js
- private/moment-locales/br.js 16 additions, 14 deletionsprivate/moment-locales/br.js
Loading
Please register or sign in to comment