Skip to content

Commit

Permalink
Merge pull request zachfitz#137 from movibe/master
Browse files Browse the repository at this point in the history
Master
  • Loading branch information
zachfitz committed Oct 20, 2015
2 parents 779e8a7 + e223dd6 commit 5a95a4b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
bower_components/

####################################
## OSX
.DS_Store
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
],
"description": "Ionic Material - Material Design for the Ionic Framework",
"main": [
"./dist/ionic.material.min.css",
"./dist/ionic.material.min.js"
"dist/ionic.material.css",
"dist/ionic.material.js"
],
"keywords": [
"Ionic",
Expand Down

0 comments on commit 5a95a4b

Please sign in to comment.