]> git.nbdom.net Git - nb.git/commitdiff
Merge branch 'master' of git.nbdom.net:nb
authorroot <sys@15gifts.com>
Fri, 6 Oct 2017 08:22:31 +0000 (09:22 +0100)
committerroot <sys@15gifts.com>
Fri, 6 Oct 2017 08:22:31 +0000 (09:22 +0100)

Trivial merge