summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorPeter 'Pita' Martischka <petermartischka@googlemail.com>2012-11-13 07:43:48 -0800
committerPeter 'Pita' Martischka <petermartischka@googlemail.com>2012-11-13 07:43:48 -0800
commit6de7634357c8db3d74863e799d57ae029846f35c (patch)
treebcd44c5d88e9edf21bbcd4cfe7e7381dcb57e5c7 /LICENSE
parentc2253e49b61019f899cdad8ec9d1037917996bcb (diff)
parent4c095202bdee57cb3720333fc2699a8e92fc087f (diff)
downloadetherpad-lite-6de7634357c8db3d74863e799d57ae029846f35c.zip
merged develop back in
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions