]> git.nbdom.net Git - nb.git/commitdiff
projects / nb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31ea890 22c2506)
Merge branch 'master' of git.nbdom.net:nb
authorNicolas Boisselier <nico@MacMini.local>
Wed, 26 Oct 2016 15:45:01 +0000 (16:45 +0100)
committerNicolas Boisselier <nico@MacMini.local>
Wed, 26 Oct 2016 15:45:01 +0000 (16: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.