Merge branch 'master' into develop

# Conflicts:
#	README.md
#	gun.js
This commit is contained in:
Mark Nadal 2016-01-26 12:59:10 -08:00
parent ce6ce34dce
commit 93bf37b94d

View File

@ -196,4 +196,4 @@
wsp(opt.server);
}
});
}({}));
}({}));