projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
14af0df
74912f1
)
Merge 0.9->trunk
author
Kim Alvefur
<zash@zash.se>
Wed, 24 Jul 2013 19:50:38 +0000
(21:50 +0200)
committer
Kim Alvefur
<zash@zash.se>
Wed, 24 Jul 2013 19:50:38 +0000
(21:50 +0200)
1
2
plugins/mod_c2s.lua
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
plugins/mod_c2s.lua
Simple merge