]> WPIA git - cassiopeia.git/commitdiff
projects / cassiopeia.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31614d2 aed0744)
Merge remote-tracking branch 'origin/master' into tmp/logger
authorFelix Dörre <felix@dogcraft.de>
Sun, 2 Aug 2015 22:23:29 +0000 (00:23 +0200)
committerFelix Dörre <felix@dogcraft.de>
Sun, 2 Aug 2015 22:23:29 +0000 (00:23 +0200)
1  2 
src/db/mysql.cpp patch | diff1 | diff2 | blob | history

diff --cc src/db/mysql.cpp
Simple merge
WPIA Certificate Signing Software