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

Add Ember.merge #10

Merged
merged 1 commit into from
Jul 4, 2017
Merged

Add Ember.merge #10

merged 1 commit into from
Jul 4, 2017

Conversation

cibernox
Copy link
Collaborator

@cibernox cibernox commented Jul 4, 2017

Closes #9

@cibernox
Copy link
Collaborator Author

cibernox commented Jul 4, 2017

The reason why I don't add it to the old-shims file it's because it was never part of it.

@rwjblue rwjblue merged commit 6e5a52c into ember-cli:master Jul 4, 2017
@cibernox cibernox deleted the add-ember-merge branch July 4, 2017 16:24
@Turbo87 Turbo87 added the bug label Jul 4, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants