projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac5c958 594b311)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 11 Mar 2016 12:41:10 +0000 (13:41 +0100)
committerKim Alvefur <zash@zash.se>
Fri, 11 Mar 2016 12:41:10 +0000 (13:41 +0100)
1  2 
prosodyctl patch | diff1 | diff2 | blob | history

diff --cc prosodyctl
Simple merge