Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
briancavalier committed Jun 27, 2012
2 parents f2441d4 + 8d4d15a commit ae714cc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{ {
"name": "when", "name": "when",
"version": "1.3.0", "version": "1.3.0-a",
"description": "A lightweight Promise and when() implementation, plus other async goodies.", "description": "A lightweight Promise and when() implementation, plus other async goodies.",
"keywords": ["promises", "when", "async"], "keywords": ["promises", "when", "async"],
"licenses": [ "licenses": [
Expand Down

0 comments on commit ae714cc

Please sign in to comment.