aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-07-08 22:01:10 +0200
committerKim Alvefur <zash@zash.se>2016-07-08 22:01:10 +0200
commit7b3f79b2ec8c94a585354d442bc9680cea62c5a3 (patch)
treee5339d0c057334591e52af0777588890d51081a5 /Makefile
parent8c0ca748b53ca43d707d86590f666bda5e908a81 (diff)
parent9741bdfb3887695e7021d793ce6a96eaf595ed2b (diff)
downloadprosody-7b3f79b2ec8c94a585354d442bc9680cea62c5a3.tar.gz
prosody-7b3f79b2ec8c94a585354d442bc9680cea62c5a3.zip
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions