]> Untitled Git - lemmy.git/commit
Merge branch 'dev' into federation
authorDessalines <tyhou13@gmx.com>
Fri, 7 Feb 2020 17:34:14 +0000 (12:34 -0500)
committerDessalines <tyhou13@gmx.com>
Fri, 7 Feb 2020 17:34:14 +0000 (12:34 -0500)
commit8130535af4e66e738fe8bf8dfc51db02f4389228
tree7eb21edcfe4c8b00ea786124c9e5b1985b4120c4
parentf247b282620480200b16613a0826b7a5d591267d
parentb6fceec6dd59403e46b80e8139081243e65a077d
Merge branch 'dev' into federation
server/config/defaults.hjson
server/src/websocket/server.rs