Merge remote-tracking branch 'origin/develop' into new-avatar-storage-types
# Conflicts: # server/startup/migrations/v096.js
No related branches found
No related tags found
Showing
- HISTORY.md 8 additions, 2 deletionsHISTORY.md
- packages/rocketchat-i18n/i18n/en.i18n.json 5 additions, 2 deletionspackages/rocketchat-i18n/i18n/en.i18n.json
- packages/rocketchat-internal-hubot/hubot.coffee 0 additions, 208 deletionspackages/rocketchat-internal-hubot/hubot.coffee
- packages/rocketchat-internal-hubot/hubot.js 247 additions, 0 deletionspackages/rocketchat-internal-hubot/hubot.js
- packages/rocketchat-internal-hubot/package.js 2 additions, 4 deletionspackages/rocketchat-internal-hubot/package.js
- packages/rocketchat-internal-hubot/scripts/maps.coffee 0 additions, 25 deletionspackages/rocketchat-internal-hubot/scripts/maps.coffee
- packages/rocketchat-internal-hubot/scripts/pugme.coffee 0 additions, 31 deletionspackages/rocketchat-internal-hubot/scripts/pugme.coffee
- packages/rocketchat-internal-hubot/settings.coffee 0 additions, 4 deletionspackages/rocketchat-internal-hubot/settings.coffee
- packages/rocketchat-internal-hubot/settings.js 10 additions, 0 deletionspackages/rocketchat-internal-hubot/settings.js
- server/startup/migrations/v096.js 3 additions, 139 deletionsserver/startup/migrations/v096.js
- server/startup/migrations/v097.js 144 additions, 0 deletionsserver/startup/migrations/v097.js
Loading
Please register or sign in to comment