aboutsummaryrefslogtreecommitdiffstats
path: root/etherpad/src/etherpad/sessions.js (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'Alexander Sulfrian2010-06-081-0/+203
|\
| * Updated SUPERDOMAINS to use /etc/etherpad.localdev-default.propertiesEgil Moeller2010-04-051-1/+1
| * reorganizing the first level of folders (trunk/branch folders are not the git...Elliot Kroo2010-03-111-0/+204
* reverted folder structure change for better mergeing with upstreamAlexander Sulfrian2010-06-081-203/+0
* reverted wrong changesalexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c2010-02-031-9/+10
* fixed handling of superdomainsalexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c2010-02-031-11/+9
* removed obsolete svn folder from hg treealexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c2010-02-031-0/+204