summaryrefslogtreecommitdiff
path: root/src/locales
diff options
context:
space:
mode:
authorJohn McLear <john@mclear.co.uk>2014-11-25 22:48:09 +0000
committerJohn McLear <john@mclear.co.uk>2014-11-25 22:48:09 +0000
commit8851b8ab6b250232d7e8cd7ce2e8500258a34325 (patch)
tree63731f7cebbc6025e9af1356902a4ec53f2c2621 /src/locales
parent881763f663e4f9cfa1356e113b02dbeff777451f (diff)
parent3a28db7f40284a2d8744185bcfab91f884a4c2ba (diff)
downloadetherpad-lite-8851b8ab6b250232d7e8cd7ce2e8500258a34325.zip
Merge branch 'develop' of github.com:ether/etherpad-lite into jsdom-go-away
Diffstat (limited to 'src/locales')
0 files changed, 0 insertions, 0 deletions