projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6a71f8d
2e52585
)
Merge 0.9->0.10
author
Kim Alvefur
<zash@zash.se>
Thu, 3 Mar 2016 15:05:34 +0000
(16:05 +0100)
committer
Kim Alvefur
<zash@zash.se>
Thu, 3 Mar 2016 15:05:34 +0000
(16:05 +0100)
1
2
plugins/mod_http_files.lua
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
plugins/mod_http_files.lua
Simple merge