Skip to content

Commit

Permalink
Merge branch 'master' into update-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
META-DREAMER authored Jan 15, 2017
2 parents 7cce2e3 + 3ac00ce commit efaa25b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@

.idea/
.idea/
9 changes: 9 additions & 0 deletions client/.npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# babel
.babelrc

# uncompiled code
src/

# misc
.DS_Store
npm-debug.log
6 changes: 3 additions & 3 deletions client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "meteor-apollo-accounts",
"version": "2.0.0",
"version": "2.0.1",
"description": "Meteor accounts in GraphQL",
"main": "./client",
"repository": {
Expand Down Expand Up @@ -33,12 +33,12 @@
"babel-preset-es2015": "6.5.0",
"babel-preset-stage-2": "^6.5.0",
"eslint": ">=3.0.0",
"graphql-tag": "^0.1.14",
"graphql-tag": "^1.0.0",
"jest-cli": "^15.1.1",
"standard": "*"
},
"peerDependencies": {
"graphql-tag": "^0.1.14"
"graphql-tag": "^1.0.0"
},
"jest": {
"testPathIgnorePatterns": [
Expand Down

0 comments on commit efaa25b

Please sign in to comment.