projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc22aa9 feb99f6)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 12 Jun 2016 18:06:30 +0000 (20:06 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 12 Jun 2016 18:06:30 +0000 (20:06 +0200)
1  2 
prosodyctl patch | diff1 | diff2 | blob | history

diff --cc prosodyctl
Simple merge