aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-05-27 16:42:50 +0200
committerKim Alvefur <zash@zash.se>2017-05-27 16:42:50 +0200
commit6245f59b5b5f3d71a25f951a37e8328c82dca6c4 (patch)
tree63f6c38195e6899a068269e4d7a1eb67c0382ecd /prosody
parent6c2de6971756e87dc7ce5165182128b4dbc05f2d (diff)
parent55e76121a0b4842f2381b10327737ab00360de57 (diff)
downloadprosody-6245f59b5b5f3d71a25f951a37e8328c82dca6c4.tar.gz
prosody-6245f59b5b5f3d71a25f951a37e8328c82dca6c4.zip
Merge 0.9->0.10
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions