projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7d777d6
f989d97
)
Merge 0.10->trunk
author
Matthew Wild
<mwild1@gmail.com>
Wed, 23 Mar 2016 12:19:23 +0000
(12:19 +0000)
committer
Matthew Wild
<mwild1@gmail.com>
Wed, 23 Mar 2016 12:19:23 +0000
(12:19 +0000)
1
2
prosodyctl
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
prosodyctl
Simple merge
projects / prosody.git / commitdiff