]> git.nbdom.net Git - nb.git/commitdiff
projects / nb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5a072d9 cb6a51a)
Merge branch 'master' of git.nbdom.net:nb
authorNicolas Boisselier <nico@MacMini.local>
Thu, 3 Nov 2016 21:30:03 +0000 (21:30 +0000)
committerNicolas Boisselier <nico@MacMini.local>
Thu, 3 Nov 2016 21:30:03 +0000 (21:30 +0000)
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.