Skip to content

Commit

Permalink
Merge pull request #3531 from paulfalgout/v3.5.1
Browse files Browse the repository at this point in the history
Bump and build v3.5.1
  • Loading branch information
paulfalgout authored Nov 9, 2017
2 parents 4541030 + e363119 commit ee153f7
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 19 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "The Backbone Framework",
"homepage": "https://marionettejs.com/",
"main": "./lib/backbone.marionette.js",
"version": "3.5.0",
"version": "3.5.1",
"license": "MIT",
"keywords": [
"backbone",
Expand Down
5 changes: 5 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
### v3.5.1 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v3.5.0...v3.5.1)

#### Fixes
* `View` entity events set in `initialize` were being undelegated if `modelEvents` or `collectionEvents` were undefined.

### v3.5.0 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v3.4.4...v3.5.0)

#### Features
Expand Down
18 changes: 12 additions & 6 deletions lib/backbone.marionette.esm.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/backbone.marionette.esm.js.map

Large diffs are not rendered by default.

18 changes: 12 additions & 6 deletions lib/backbone.marionette.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/backbone.marionette.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions lib/backbone.marionette.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/backbone.marionette.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "backbone.marionette",
"description": "The Backbone Framework",
"version": "3.5.0",
"version": "3.5.1",
"homepage": "https://marionettejs.com/",
"main": "lib/backbone.marionette.js",
"keywords": [
Expand Down

0 comments on commit ee153f7

Please sign in to comment.