Skip to content

Commit

Permalink
Merge pull request #69 from ahumphreys87/build-0.1.11
Browse files Browse the repository at this point in the history
bump and build 0.1.11
  • Loading branch information
samccone committed Mar 16, 2016
2 parents c823f90 + 5267f24 commit a0ac46b
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 11 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change log

### v0.1.11

* Bump version range of backbone support.

### v0.1.10

* Bump version range of backbone support.
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "backbone.babysitter",
"version": "0.1.10",
"version": "0.1.11",
"homepage": "https://github.com/marionettejs/backbone.babysitter",
"authors": [
"Derick Bailey <derickbailey@gmail.com>"
Expand Down
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "backbone.babysitter",
"description": "Manage child views in a Backbone.View",
"version": "0.1.10",
"version": "0.1.11",
"repo": "marionettejs/backbone.babysitter",
"main": "lib/backbone.babysitter.js",
"keywords": [
Expand Down
6 changes: 3 additions & 3 deletions lib/backbone.babysitter.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Backbone.BabySitter
// -------------------
// v0.1.10
// v0.1.11
//
// Copyright (c)2015 Derick Bailey, Muted Solutions, LLC.
// Copyright (c)2016 Derick Bailey, Muted Solutions, LLC.
// Distributed under MIT license
//
// http://github.com/marionettejs/backbone.babysitter
Expand Down Expand Up @@ -178,7 +178,7 @@
})(Backbone, _);


Backbone.ChildViewContainer.VERSION = '0.1.10';
Backbone.ChildViewContainer.VERSION = '0.1.11';

Backbone.ChildViewContainer.noConflict = function () {
Backbone.ChildViewContainer = previousChildViewContainer;
Expand Down
9 changes: 5 additions & 4 deletions lib/backbone.babysitter.min.js

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

1 change: 1 addition & 0 deletions lib/backbone.babysitter.min.js.map

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "backbone.babysitter",
"description": "Manage child views in a Backbone.View",
"version": "0.1.10",
"version": "0.1.11",
"homepage": "https://github.com/marionettejs/backbone.babysitter",
"main": "lib/backbone.babysitter.js",
"keywords": [
Expand Down Expand Up @@ -48,7 +48,7 @@
"grunt-contrib-connect": "0.1.2",
"grunt-contrib-jasmine": "^0.9.2",
"grunt-contrib-jshint": "0.1.1",
"grunt-contrib-uglify": "0.1.1",
"grunt-contrib-uglify": "1.0.1",
"grunt-contrib-watch": "0.2.0",
"grunt-preprocess": "4.0.0",
"grunt-template": "0.2.3"
Expand Down

0 comments on commit a0ac46b

Please sign in to comment.