projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 367213c a630239)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 30 May 2016 11:17:28 +0000 (13:17 +0200)
committerKim Alvefur <zash@zash.se>
Mon, 30 May 2016 11:17:28 +0000 (13:17 +0200)
1  2 
prosodyctl patch | diff1 | diff2 | blob | history

diff --cc prosodyctl
Simple merge