]> git.nbdom.net Git - nb.git/commitdiff
projects / nb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44d91a3 001fd8e)
Merge conflict resolution
authorNicolas Boisselier <nicolas.boisselier@gmail.com>
Sun, 30 Apr 2023 22:18:29 +0000 (00:18 +0200)
committerNicolas Boisselier <nicolas.boisselier@gmail.com>
Sun, 30 Apr 2023 22:18:29 +0000 (00:18 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.