Upgrade to the latest angular, and drop browserify-shim #31
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Looks good, if you can just resolve the merge conflicts I'll merge it in! |
added 2 commits
March 28, 2015 01:59
DrewML
force-pushed
the
updateAngularToLatest
branch
from
8b6ba58 to
10523eb
Compare
|
Merge conflicts all fixed up! |
jakemmarsh
added a commit
that referenced
this pull request
Mar 28, 2015
Upgrade to the latest angular, and drop browserify-shim
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR updates
angular,angular-mocks, andangular-ui-routerto their latest stable versions.It also removes
browserify-shim, which is no longer necessary since the instantaneous-browserification release of AngularJS, which now packages it as a CommonJS module (hooray!).