]> Untitled Git - lemmy.git/commitdiff
Merge branch 'master' of https://github.com/makigi-io/makigi into makigi-io-master
authorDessalines <tyhou13@gmx.com>
Mon, 22 Jun 2020 18:52:46 +0000 (14:52 -0400)
committerDessalines <tyhou13@gmx.com>
Mon, 22 Jun 2020 18:52:46 +0000 (14:52 -0400)
1  2 
server/src/lib.rs
ui/translations/en.json

Simple merge
Simple merge