projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 22c35a1 50bf1e9)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 3 Dec 2015 14:59:55 +0000 (14:59 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 3 Dec 2015 14:59:55 +0000 (14:59 +0000)
1  2 
core/storagemanager.lua patch | diff1 | diff2 | blob | history

diff --cc core/storagemanager.lua
Simple merge