Skip to content

Commit

Permalink
Merge branch '1.4.26'
Browse files Browse the repository at this point in the history
  • Loading branch information
jkutianski committed Oct 26, 2017
2 parents a49be27 + 69252d3 commit 8ec1e4e
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 24 deletions.
23 changes: 6 additions & 17 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,19 +1,8 @@
lib-cov
*.seed
*.log
*.csv
*.dat
*.out
*.pid
*.gz
# Mac OS X
.DS_Store

keys.bat

pids
logs
results

node_modules
# Node.js
.npmrc
node_modules/
npm-debug.log
/docs/
/package-lock.json
package-lock.json
22 changes: 18 additions & 4 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
scripts
node_modules
docs
wiki
README.md
Makefile
docs/
examples/
test/
wiki/

# Mac OS X
.DS_Store

# Node.js
.npmignore
.npmrc
node_modules/
npm-debug.log

# Git
.git*
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
{
"name": "meetup-api",
"description": "Meetup API library",
"version": "1.4.25",
"version": "1.4.26",
"keywords": [
"meetup",
"api"
],
"main": "index.js",
"author": "Juan Pablo Kutianski <[email protected]>",
"author": {
"name": "Juan Pablo Kutianski",
"email": "[email protected]",
"url": "https://github.com/jkutianski"
},
"bugs": {
"url": "http://github.com/jkutianski/meetup-api/issues"
},
Expand Down
2 changes: 1 addition & 1 deletion tonicExample.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var _meetup = require('meetup-api')();
var _proxy = require('proxy-agent'); // runkit workaround
// var _proxy = require('proxy-agent'); // runkit workaround

// _meetup.proxy = 'http://149.202.94.120:3128';

Expand Down

0 comments on commit 8ec1e4e

Please sign in to comment.