Skip to content

Commit

Permalink
Merge branch 'prep-1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
nathanpalmer committed Oct 8, 2015
2 parents 3390080 + 77410b1 commit ce7cff9
Show file tree
Hide file tree
Showing 90 changed files with 1,635 additions and 451 deletions.
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ dist/
.npmignore
**/.gitkeep
bower.json
ember-cli-build.js
Brocfile.js
testem.json
3 changes: 3 additions & 0 deletions .watchmanconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignore_dirs": ["tmp"]
}
24 changes: 0 additions & 24 deletions Brocfile.js

This file was deleted.

Loading

0 comments on commit ce7cff9

Please sign in to comment.