Code

Develop sync#7590

Code

Merged

rodrigok merged 10 commits intodevelopRocketChat/Rocket.Chat:developfrom develop-syncRocketChat/Rocket.Chat:develop-syncCopy head branch name to clipboardJul 27, 2017

+20-5

Commits

Commits on Jul 14, 2017

• Merge pull request #7443 from RocketChat/hotfix/allow-s3-custom-endpoint

  Show description for e7e6cbe
  rodrigok

  committed
  e7e6cbe

  Copy full SHA for e7e6cbe

• Merge pull request #7432 from RocketChat/fix-private-message-submit

  Show description for f0c2447
  rodrigok

  committed
  f0c2447

  Copy full SHA for f0c2447

• Merge pull request #7469 from RocketChat/fix-file-uploads-on-slack-import

  Show description for b19f95c
  rodrigok

  committed
  b19f95c

  Copy full SHA for b19f95c

• Merge pull request #7403 from RocketChat/fix-unread-bar

  Show description for 4974ca3
  rodrigok

  committed
  4974ca3

  Copy full SHA for 4974ca3

• Merge pull request #7472 from RocketChat/always-set-ldap-property

  Show description for 9aba96e
  rodrigok

  committed
  9aba96e

  Copy full SHA for 9aba96e

• Merge pull request #7431 from RocketChat/fix-show-email

  Show description for 167809c
  

  engelgabriel

  authored and

  rodrigok

  committed
  167809c

  Copy full SHA for 167809c

• Bump version to 0.57.2

  rodrigok

  committed
  5ee53de

  Copy full SHA for 5ee53de

Commits on Jul 27, 2017

• Merge remote-tracking branch 'origin/master' into develop-sync

  Show description for eac3bf8
  rodrigok

  committed
  eac3bf8

  Copy full SHA for eac3bf8

• Set version to 0.58.0-develop

  rodrigok

  committed
  459e890

  Copy full SHA for 459e890

• Update listPrivateGroupsFlex.js

  rodrigok

  authored
  7d90534

  Copy full SHA for 7d90534