summaryrefslogtreecommitdiffstats
path: root/etherpad/src/etherpad/control/global_pro_account_control.js
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'Alexander Sulfrian2010-06-081-0/+143
|\
| * reorganizing the first level of folders (trunk/branch folders are not the git...Elliot Kroo2010-03-111-0/+143
* reverted folder structure change for better mergeing with upstreamAlexander Sulfrian2010-06-081-143/+0
* changed hardcoded etherpad.com domainsalexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c2010-02-031-1/+1
* removed obsolete svn folder from hg treealexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c2010-02-031-0/+143