aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-11-19 17:37:52 +0100
committerKim Alvefur <zash@zash.se>2016-11-19 17:37:52 +0100
commit9d8ddba6ca4e2fcdb8939e521fd194fc0d34f680 (patch)
treea4e4f275e9d2fa0c365a3f06ce1834356f37111c /Makefile
parentbdaf30fb8741ebbf5804dfff210bfd8a3eac66d5 (diff)
parentbbb91af188a026dad2dae1915d9ae2ba20daaf02 (diff)
downloadprosody-9d8ddba6ca4e2fcdb8939e521fd194fc0d34f680.tar.gz
prosody-9d8ddba6ca4e2fcdb8939e521fd194fc0d34f680.zip
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions