Skip to content

Conversation

@sampaiodiego
Copy link
Member

@RocketChat/core

@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-7159 June 3, 2017 02:48 Inactive
@geekgonecrazy geekgonecrazy merged commit 28366df into develop Jun 3, 2017
@geekgonecrazy geekgonecrazy deleted the fix-setavatar-rest-endpoint branch June 3, 2017 02:50
Syirrus pushed a commit to Syirrus/Rocket.Chat that referenced this pull request Jun 5, 2017
…nto clarapy-v4

* 'develop' of https://github.com/RocketChat/Rocket.Chat: (102 commits)
  Fix forbidden error on setAvatar REST endpoint (RocketChat#7159)
  Fix migration version
  Switch logic of artifact name (RocketChat#7158)
  fix reactions
  Remove missing CoffeeScript dependencies
  Update server.js
  Update server.js
  Update server.js
  [FIX] Fix highlightjs bug (RocketChat#6991)
  Convert hipchat importer to js
  Convert file unsubscribe.coffee to js
  Fix migration if email already exists
  [NEW] Internal Hubot load scripts from custom folders (RocketChat#7095)
  Unit: Fix mentions tests
  Unit: Fix mentions tests
  Fix tests
  remove the missing coffee files
  fix eslint
  Bump
  Update oauth2-client.js
  ...

# Conflicts:
#	packages/rocketchat-ui-master/.npm/package/npm-shrinkwrap.json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants