Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
bluet authored Jan 2, 2017
2 parents dd52dc4 + 7d6ebde commit f087f0e
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 17 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
language: node_js
node_js:
- "7"
- "6"
- "5"
- "4"
Expand All @@ -8,7 +9,7 @@ env:
- CI_TEST=no-lint
matrix:
include:
- node_js: "6"
- node_js: "7"
script: npm run lint
env:
- CI_TEST=lint-only
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Changelog
=========

## 2.0.0-beta1

* Update deps

## 2.0.0-alpha1

* **BREAKING CHANGE**: Dropped support for FQL and Legacy REST Api
Expand Down
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fb",
"version": "2.0.0-alpha1",
"version": "2.0.0-beta1",
"description": "NodeJS Library for Facebook",
"keywords": [
"facebook",
Expand All @@ -27,26 +27,26 @@
},
"dependencies": {
"any-promise": "^1.3.0",
"babel-runtime": "^6.9.0",
"core-decorators": "^0.12.3",
"debug": "^2.2.0",
"request": "^2.72.0"
"babel-runtime": "^6.20.0",
"core-decorators": "^0.14.0",
"debug": "^2.3.3",
"request": "^2.79.0"
},
"devDependencies": {
"babel-cli": "^6.9.0",
"babel-eslint": "^6.0.4",
"babel-cli": "^6.18.0",
"babel-eslint": "^7.1.1",
"babel-plugin-transform-decorators-legacy": "^1.3.4",
"babel-plugin-transform-runtime": "^6.9.0",
"babel-plugin-transform-runtime": "^6.15.0",
"babel-preset-es2015-node4": "^2.1.0",
"babel-preset-stage-0": "^6.5.0",
"babel-register": "^6.9.0",
"bluebird": "^3.4.0",
"babel-preset-stage-0": "^6.16.0",
"babel-register": "^6.18.0",
"bluebird": "^3.4.6",
"chai": "^3.5.0",
"eslint": "^2.10.2",
"lodash.omit": "^4.3.0",
"mocha": "^2.4.5",
"mocha-eslint": "^2.0.2",
"nock": "^8.0.0"
"eslint": "^3.12.0",
"lodash.omit": "^4.5.0",
"mocha": "^3.2.0",
"mocha-eslint": "^3.0.1",
"nock": "^9.0.2"
},
"engines": {
"node": ">=4"
Expand Down

0 comments on commit f087f0e

Please sign in to comment.