aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2017-03-17 13:08:31 +0000
committerMatthew Wild <mwild1@gmail.com>2017-03-17 13:08:31 +0000
commit3f6b2ced44f52b65d774e5f1486c87e71f5ece36 (patch)
treebde2c18dd96f4ad8dbf284a4e6c95d1172975c37 /CHANGES
parent3e5d5895f9365fbecf497d9080f8f5705a3266a6 (diff)
parentb9135dfdd21b5ebb88a86aed3cf41e40af7e8e7e (diff)
downloadprosody-3f6b2ced44f52b65d774e5f1486c87e71f5ece36.tar.gz
prosody-3f6b2ced44f52b65d774e5f1486c87e71f5ece36.zip
Merge 0.10 -> trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions