summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn McLear <john@mclear.co.uk>2015-01-01 17:25:24 +0000
committerJohn McLear <john@mclear.co.uk>2015-01-01 17:25:24 +0000
commitbe4782ae07dcabb9144d80b64cbebb5ad76ef61d (patch)
treee8b051b39b5f79b53ea096285c6626e8a3301614
parent95af55992a1fc38f473349e484df3630b6eeba79 (diff)
parentcbfc8330cca5377c877f687570ab61ccfa194fb6 (diff)
downloadetherpad-lite-be4782ae07dcabb9144d80b64cbebb5ad76ef61d.zip
Merge pull request #2425 from ether/master
Merge pull request #2424 from ether/release/1.5.0
0 files changed, 0 insertions, 0 deletions