Resolve conflicts -- Jason, please check that the authentication logic is still good.
authorMike Taylor <mike@indexdata.com>
Thu, 21 Aug 2014 18:57:04 +0000 (19:57 +0100)
committerMike Taylor <mike@indexdata.com>
Thu, 21 Aug 2014 18:57:04 +0000 (19:57 +0100)
commit6012a73cb2d7f59862ba4a0e624d62dc84c099d9
tree7d0aa3de601c770fe06bf3c5350bb12589db2e16
parent2dc4cb569b76707f3ac0b23bf53d64ee5c98130b
parent72cd7bfd705eeda14cf9cf850eb070f60b9e754e
Resolve conflicts -- Jason, please check that the authentication logic is still good.
src/mkws-core.js