projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 893fc70 f339d5a)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 5 Jul 2015 16:00:05 +0000 (18:00 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 5 Jul 2015 16:00:05 +0000 (18:00 +0200)
1  2 
plugins/mod_storage_sql2.lua patch | diff1 | diff2 | blob | history

diff --cc plugins/mod_storage_sql2.lua
Simple merge