Skip to content
This repository has been archived by the owner on Nov 17, 2020. It is now read-only.

Commit

Permalink
Merge pull request #78 from ahumphreys87/build-1.3.6
Browse files Browse the repository at this point in the history
Bump and build 1.3.6
  • Loading branch information
samccone committed Mar 16, 2016
2 parents 60bafbd + 2fb2113 commit 06ceac3
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 13 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Change log

### v1.3.6
* Bump version range of backbone.

### v1.3.5
* Bump version range of backbone.

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.wreqr",
"version": "1.3.5",
"version": "1.3.6",
"homepage": "https://github.com/marionettejs/backbone.wreqr",
"authors": [
"Derick Bailey"
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.wreqr",
"description": "A Simple Service Bus For Backbone and Backbone.Marionette",
"version": "1.3.5",
"version": "1.3.6",
"repo": "marionettejs/backbone.wreqr",
"keywords": [
"backbone",
Expand Down
6 changes: 3 additions & 3 deletions lib/backbone.wreqr.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Backbone.Wreqr (Backbone.Marionette)
// ----------------------------------
// v1.3.5
// v1.3.6
//
// 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.wreqr
Expand All @@ -29,7 +29,7 @@

var Wreqr = Backbone.Wreqr = {};

Backbone.Wreqr.VERSION = '1.3.5';
Backbone.Wreqr.VERSION = '1.3.6';

Backbone.Wreqr.noConflict = function () {
Backbone.Wreqr = previousWreqr;
Expand Down
2 changes: 1 addition & 1 deletion lib/backbone.wreqr.map

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

Loading

0 comments on commit 06ceac3

Please sign in to comment.