projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a13823 8e9ad79)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 18 Mar 2016 14:03:35 +0000 (14:03 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 18 Mar 2016 14:03:35 +0000 (14:03 +0000)
1  2 
prosodyctl patch | diff1 | diff2 | blob | history

diff --cc prosodyctl
Simple merge