]> git.nbdom.net Git - nb.git/commitdiff
projects / nb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1446193 7f7442d)
Merge branch 'master' of git.nbdom.net:nb
authorNicolas Boisselier <nicolas.boisselier@semantico.com>
Mon, 15 Aug 2016 10:45:02 +0000 (11:45 +0100)
committerNicolas Boisselier <nicolas.boisselier@semantico.com>
Mon, 15 Aug 2016 10:45:02 +0000 (11:45 +0100)
1  2 
lib/php/db.php patch | diff1 | diff2 | blob | history

diff --cc lib/php/db.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.