1
0
Fork 0

Merge branch 'master' into virtual/master

Conflicts:
	lib/member_builder.js
	lib/util.js
	test/test-member_builder-prop.js
closure/master
Mike Gerwitz 2011-06-30 23:11:51 -04:00
commit 3820ee4b07
1 changed files with 1 additions and 1 deletions

View File

@ -16,7 +16,7 @@
"dependencies": {}, "dependencies": {},
"devDependencies": { "devDependencies": {
"uglify-js": ">=1.0.2" "uglify-js": "<=1.0.2"
}, },
"licenses": [ "licenses": [