docs: merge conflicts between the patch to document "127.0.0.1" instead of "localhost...
authorZooko O'Whielacronx <zooko@zooko.com>
Fri, 18 Apr 2008 03:57:41 +0000 (20:57 -0700)
committerZooko O'Whielacronx <zooko@zooko.com>
Fri, 18 Apr 2008 03:57:41 +0000 (20:57 -0700)
commit3d4a339857168d90c259f72579382bce30a701ee
tree84c8dcf8eaa6c356697300aa3a6af75b7fe71adf
parent7b2ca46b35d40d39637fc99fa280141b6fbead63
docs: merge conflicts between the patch to document "127.0.0.1" instead of "localhost" and some other patches (precisely which, I don't know)
docs/webapi.txt