diff options
author | Alexander Early <aearly@fluid.com> | 2015-06-07 18:30:10 -0700 |
---|---|---|
committer | Alexander Early <aearly@fluid.com> | 2015-06-07 18:30:10 -0700 |
commit | 9697f400997d211ad18a04a1b61febbb397fe0b0 (patch) | |
tree | 22348e76f15d8ed7866dd439c9502f22af962851 /package.json | |
parent | 0450c3b5bdc5db8a50b19fc9d70c48c8a88bac7d (diff) | |
parent | 46cbdfd5324be57f15481bee32ad0fda507171b0 (diff) | |
download | async-9697f400997d211ad18a04a1b61febbb397fe0b0.tar.gz |
merge 1.1.x into master
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json index d739e2d..b1cecc7 100644 --- a/package.json +++ b/package.json @@ -59,4 +59,4 @@ "tests" ] } -}
\ No newline at end of file +} |