Skip to content

Commit

Permalink
Merge pull request #14 from rynam0/master
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefan Gasser committed Mar 14, 2015
2 parents 3885d34 + 3229fc5 commit 09057b9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
2 changes: 1 addition & 1 deletion app/components/materialize-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ export default Ember.Component.extend({
}.property('buttonType'),
click: function(){
this.sendAction();
},
}
});
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"jquery": "^1.11.1",
"ember": "1.10.0",
"ember-data": "1.0.0-beta.15",
"ember-resolver": "~0.1.11",
"loader.js": "ember-cli/loader.js#1.0.1",
"ember-resolver": "~0.1.12",
"loader.js": "ember-cli/loader.js#3.2.0",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
"ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
Expand Down
18 changes: 8 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,19 @@
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.0.0",
"ember-cli": "0.2.0-beta.1",
"ember-cli-babel": "~4.1.0",
"ember-cli-app-version": "0.3.1",
"ember-cli": "^0.2.0",
"ember-cli-app-version": "0.3.2",
"ember-cli-babel": "^4.0.0",
"ember-cli-content-security-policy": "0.3.0",
"ember-cli-dependency-checker": "0.0.7",
"ember-cli-htmlbars": "~0.7.4",
"ember-cli-dependency-checker": "0.0.8",
"ember-cli-htmlbars": "0.7.4",
"ember-cli-ic-ajax": "0.1.1",
"ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-qunit": "~0.3.8",
"ember-cli-qunit": "0.3.9",
"ember-cli-sass": "^3.0.3",
"ember-cli-uglify": "1.0.1",
"ember-data": "~1.0.0-beta.15",
"ember-export-application-global": "^1.0.2",
"express": "^4.8.5",
"glob": "^4.0.5"
"ember-data": "1.0.0-beta.15",
"ember-export-application-global": "^1.0.2"
},
"description": "An ember-cli addon for using Materialize (CSS Framework based on Material Design) in Ember applications.",
"keywords": [
Expand Down

0 comments on commit 09057b9

Please sign in to comment.