public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Pita/etherpad-lite into develop 

Conflicts:
	README.md
pull/1238/head
John McLear 2012-11-14 15:23:38 -08:00
parent dc3db7a4a8 a5c4fb154f
commit a3a0e1d77f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
README.md
View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
# Making collaborative editing the standard on the web # Making collaborative editing the standard on the web
# About # About
@ -123,4 +124,10 @@ Join the [mailinglist](http://groups.google.com/group/etherpad-lite-dev) and mak
* Paypal - Press the donate button on [etherpad.org](http://etherpad.org) * Paypal - Press the donate button on [etherpad.org](http://etherpad.org)
# License # License
[Apache License v2](http://www.apache.org/licenses/LICENSE-2.0.html) [Apache License v2](http://www.apache.org/licenses/LICENSE-2.0.html)
=======
We moved!
=============
You can now find Etherpad Lite under [github.com/ether/etherpad-lite](https://github.com/ether/etherpad-lite)
>>>>>>> a5c4fb154f7414cd5dca9e50c3f2ad00e42672f5