]> git.puffer.fish Git - matthieu/nova.git/commitdiff
resolve conflicts
authorMatthieu <matthieu@developershouse.xyz>
Sat, 7 Aug 2021 10:30:01 +0000 (14:30 +0400)
committerMatthieu <matthieu@developershouse.xyz>
Sat, 7 Aug 2021 10:30:01 +0000 (14:30 +0400)

Trivial merge