Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

minor livechat updates #1480

Merged
merged 10 commits into from
Nov 24, 2015
Merged

minor livechat updates #1480

merged 10 commits into from
Nov 24, 2015

Conversation

sampaiodiego
Copy link
Member

No description provided.

Conflicts:
	client/startup/defaultRoomTypes.coffee
	packages/rocketchat-lib/lib/roomTypes.coffee
	packages/rocketchat-livechat/client/ui.js
	packages/rocketchat-livechat/permissions.js
	packages/rocketchat-ui-sidenav/side-nav/chatRoomItem.coffee
	packages/rocketchat-ui-sidenav/side-nav/sideNav.coffee
sampaiodiego added a commit that referenced this pull request Nov 24, 2015
@sampaiodiego sampaiodiego merged commit 69a1d2c into develop Nov 24, 2015
@engelgabriel engelgabriel deleted the livechat-migration-to-ecma-2015 branch November 24, 2015 16:40
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.

1 participant