projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: df4d9d1 1c8107c)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 28 Feb 2016 17:25:16 +0000 (18:25 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 28 Feb 2016 17:25:16 +0000 (18:25 +0100)
1  2 
prosodyctl patch | diff1 | diff2 | blob | history

diff --cc prosodyctl
Simple merge