diff options
author | Peter Martischka <pita@pitapoison.de> | 2010-04-15 09:45:50 +0200 |
---|---|---|
committer | Peter Martischka <pita@pitapoison.de> | 2010-04-15 09:45:50 +0200 |
commit | 7530d58f61101db91e03ba075a47299db1f96f35 (patch) | |
tree | 47ffdd57af4cd4fb7c84b656cf25596e5a23f276 | |
parent | 0a385d0682b3a390f278ac8301e08b1f90479c10 (diff) | |
parent | f8aa31de5a701b7f3f7eb1a0397a97b3787631b3 (diff) | |
download | etherpad-7530d58f61101db91e03ba075a47299db1f96f35.tar.gz etherpad-7530d58f61101db91e03ba075a47299db1f96f35.tar.xz etherpad-7530d58f61101db91e03ba075a47299db1f96f35.zip |
Merge branch 'master' of http://github.com/sesam/pad
-rw-r--r-- | README.md | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,6 +1,6 @@ # About Etherpad EtherPad is a web-based realtime collaborative document editor. -EtherPad currently lives at http://etherpad.org +EtherPad currently lives at <http://etherpad.org> -For instructions to build and run EtherPad, see: http://doc.etherpad.org/ep/tag/?query=installation +For instructions to build and run EtherPad, see: <http://doc.etherpad.org/ep/tag/?query=installation> |