Skip to content

Merge 0.58.4 to master#8420

Merged
rodrigok merged 6 commits into
masterfrom
0.58.4
Oct 6, 2017
Merged

Merge 0.58.4 to master#8420
rodrigok merged 6 commits into
masterfrom
0.58.4

Conversation

@rodrigok
Copy link
Copy Markdown
Member

@rodrigok rodrigok commented Oct 6, 2017

@RocketChat/core

[FIX] Add needed dependency for snaps
[FIX] Slack import failing and not being able to be restarted
# Conflicts:
#	packages/rocketchat-i18n/i18n/en.i18n.json
…helper

[FIX] Duplicate code in rest api letting in a few bugs with the rest api
# Conflicts:
#	packages/rocketchat-api/server/api.js
#	packages/rocketchat-api/server/v1/channels.js
#	packages/rocketchat-api/server/v1/groups.js
#	packages/rocketchat-api/server/v1/im.js
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-8420 October 6, 2017 00:51 Inactive
@rodrigok rodrigok merged commit b6eb0b0 into master Oct 6, 2017
@rodrigok rodrigok deleted the 0.58.4 branch October 6, 2017 17:37
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.

3 participants