Skip to content

Fix branch conflicts #17

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.

Sign up for GitHub

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

Merged
mikeproeng37 merged 2 commits into from
Nov 14, 2016
Merged

Fix branch conflicts #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e1398c
Bump to version 1.0.0 (#12)
mikeproeng37 Oct 3, 2016
3d3df46
Merge branch 'master' into devel
Nov 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-------------------------------------------------------------------------------
1.1.0
-------------------------------------------------------------------------------
* Add global variable name export for use in non CommonJS environments
* Add global variable name export for use in non-CommonJS environments
* Remove redundant lodash core dependency to reduce bundle bloat
-------------------------------------------------------------------------------

Expand Down