Skip to content

Commit

Permalink
Merge pull request #203 from prey/bumps-version-1.6.0
Browse files Browse the repository at this point in the history
Version 1.6.0 in package.json
  • Loading branch information
raliste committed May 11, 2016
2 parents 4f94144 + 3aa85f6 commit e2f259c
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 9 deletions.
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,12 @@ Just make sure to add tests for your feature or bugfix, so we don't break it in

## Authors

By Tomás Pollak, with the help of contributors.
By Tomás Pollak, with the help of the following contributors:

- Carlos Yaconi
- Javier Acuña
- Mauricio Schneider
- Rodrigo Aliste

## Credits

Expand All @@ -121,6 +126,6 @@ By Tomás Pollak, with the help of contributors.

## Legal

Copyright © 2011-2014, Fork Ltd.
Copyright © 2011-2016 Prey, Inc.
Released under the GPLv3 license.
For full details see the `license.txt` file included in this distribution.
20 changes: 16 additions & 4 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "prey",
"version": "1.5.1",
"author": "Tomás Pollak <tomas@forkhq.com>",
"version": "1.6.0",
"author": "Client Engineering <client-eng@preyhq.com>",
"keywords": [
"prey",
"anti",
Expand Down Expand Up @@ -65,7 +65,8 @@
"which": "",
"wink": "0.0.1",
"winssh": "",
"wmic": "0.0.7"
"wmic": "0.0.7",
"winattr": "1.1.0"
},
"devDependencies": {
"mkdirp": "",
Expand Down

0 comments on commit e2f259c

Please sign in to comment.