summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorJohn McLear <john@mclear.co.uk>2014-11-26 15:33:13 +0000
committerJohn McLear <john@mclear.co.uk>2014-11-26 15:33:13 +0000
commit88b3d99fbd8c73fe585c46879a20715a9705fcb7 (patch)
treeb66ace587bfd073ca7556051ed10a769b7467461 /README.md
parent7a4a3b5ef312327d8f16503a74911c60df3f2f09 (diff)
parentb4ddeffd04b3cf414434e0090e0488ebf3a07ece (diff)
downloadetherpad-lite-88b3d99fbd8c73fe585c46879a20715a9705fcb7.zip
Merge branch 'develop' of github.com:ether/etherpad-lite into backend-tests
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions