diff options
| author | Egil Moeller <egil.moller@freecode.no> | 2010-03-22 00:16:53 +0100 |
|---|---|---|
| committer | Egil Moeller <egil.moller@freecode.no> | 2010-03-22 00:16:53 +0100 |
| commit | fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7 (patch) | |
| tree | 928419d6bfe794865e4b8f0634bd792f795c4b8a /LICENSE | |
| parent | 0fdab3db005c4fa31fb8306b573c0b35073d3e56 (diff) | |
| parent | d56b9b3b82cdebcaeb00eec0fcb4326ad21adaa8 (diff) | |
| download | etherpad-fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7.tar.gz etherpad-fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7.tar.xz etherpad-fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7.zip | |
Merge branch 'master' into plugin-framework
Diffstat (limited to '')
| -rw-r--r-- | LICENSE (renamed from trunk/README) | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -1,9 +1,3 @@ -EtherPad is a web-based realtime collaborative document editor. - -EtherPad currently lives at http://code.google.com/p/etherpad - -For instructions to build and run EtherPad, see: http://code.google.com/p/etherpad/wiki/Instructions - This distribution includes some code written by other organizations. The rest is Copyright 2007-2009 Google Inc. and licensed under the Apache License 2.0. |