summaryrefslogtreecommitdiffstats
path: root/etherpad/src/etherpad/control/pad/pad_control.js
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'Alexander Sulfrian2010-06-081-0/+754
|\
| * Generalized the page.ejs a bit more so that it can be used by all pages for realEgil Moeller2010-04-101-30/+4
| * reorganizing the first level of folders (trunk/branch folders are not the git...Elliot Kroo2010-03-111-0/+780
* reverted folder structure change for better mergeing with upstreamAlexander Sulfrian2010-06-081-780/+0
* changed hardcoded etherpad.com domainsalexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c2010-02-031-3/+3
* removed obsolete svn folder from hg treealexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c2010-02-031-0/+780