]> Untitled Git - lemmy.git/commitdiff
Merge branch 'admin_settings' into dev
authorDessalines <tyhou13@gmx.com>
Tue, 14 Apr 2020 19:45:49 +0000 (15:45 -0400)
committerDessalines <tyhou13@gmx.com>
Tue, 14 Apr 2020 19:45:49 +0000 (15:45 -0400)

Trivial merge