]> git.nbdom.net Git - nb.git/commitdiff
Merge branch 'master' into testing
authorNicolas Boisselier <nicolas.boisselier@gmail.com>
Tue, 15 May 2018 13:19:03 +0000 (14:19 +0100)
committerNicolas Boisselier <nicolas.boisselier@gmail.com>
Tue, 15 May 2018 13:19:03 +0000 (14:19 +0100)

Trivial merge