aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-06-01 14:05:58 +0200
committerKim Alvefur <zash@zash.se>2017-06-01 14:05:58 +0200
commit7586690f44817e61f5a0ef8974a7bdba38d86028 (patch)
tree241ce473feccaef38dcf409ebac3d60868fc6a72 /Makefile
parentf176688ed175d5e8768b3232a9d934f9a380bd61 (diff)
parent3c37921b044842e3c1e73cea3ac9be6bbcf997ed (diff)
downloadprosody-7586690f44817e61f5a0ef8974a7bdba38d86028.tar.gz
prosody-7586690f44817e61f5a0ef8974a7bdba38d86028.zip
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions