Skip to content

Commit

Permalink
Merge branch 'release/0.12.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
budnix committed May 25, 2016
2 parents cf2e3cd + 2a537fb commit 59a3066
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "ngHandsontable",
"dependencies": {
"angular": "~1.4",
"handsontable": "~0.24.0"
"handsontable": "~0.25.0"
},
"homepage": "https://github.com/handsontable/ngHandsontable",
"authors": [
Expand Down
2 changes: 1 addition & 1 deletion demo/build/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof requ
}
config.$inject = ['$sceDelegateProvider', '$httpProvider', '$stateProvider', '$compileProvider', '$urlRouterProvider', 'demoMapProvider'];

app.constant('version', 'v0.11.1');
app.constant('version', 'v0.12.0');
app.config(config);

angular.element(document).ready(function() {
Expand Down
4 changes: 2 additions & 2 deletions dist/ngHandsontable.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/**
* ngHandsontable 0.11.1
* ngHandsontable 0.12.0
*
* Copyright 2012-2015 Marcin Warpechowski
* Copyright 2015 Handsoncode sp. z o.o. <hello@handsontable.com>
* Licensed under the MIT license.
* https://github.com/handsontable/ngHandsontable
* Date: Fri May 20 2016 09:23:23 GMT+0200 (CEST)
* Date: Wed May 25 2016 15:56:21 GMT+0200 (CEST)
*/

if (document.all && !document.addEventListener) { // IE 8 and lower
Expand Down
4 changes: 2 additions & 2 deletions dist/ngHandsontable.min.js

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"url": "https://github.com/handsontable/ngHandsontable/issues"
},
"author": "Marcin Warpechowski <hello@handsontable.com>",
"version": "0.11.1",
"version": "0.12.0",
"devDependencies": {
"angular": "^1.5.0",
"angular-mocks": "^1.5.0",
Expand Down

0 comments on commit 59a3066

Please sign in to comment.