Felix Ableitner 59cce4a1f5 Rewrite merge code to fix tests		2021-02-22 18:57:15 +01:00
..
docker-compose.yml	Rewrite merge code to fix tests	2021-02-22 18:57:15 +01:00
nginx.conf	Moving docs to join.lemmy.ml . Fixes #1396 (#1410)	2021-02-05 12:30:49 +00:00
start-local-instances.bash	Rewrite merge code to fix tests	2021-02-22 18:57:15 +01:00