| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2012-03-02 | Merge branch 'pita' | Egil Moeller | |
| Resolved conflicts: .gitignore src/static/js/ace.js src/static/js/ace2_inner.js src/static/js/broadcast.js src/static/js/domline.js src/static/pad.html src/static/timeslider.html Ignored conflicts (please merge manually later): node/server.js src/node/utils/Minify.js | |||
| 2012-02-26 | The Big Renaming - etherpad is now an NPM module | Egil Moeller | |
 |
index : etherpad-lite | |
| Really real-time collaborative document editing. http://etherpad.org | cos |
| summaryrefslogtreecommitdiff |