From: Dessalines <tyhou13@gmx.com>
Date: Fri, 5 Jun 2020 17:05:14 +0000 (-0400)
Subject: Merge remote-tracking branch 'yerba/limit-memory'
X-Git-Url: http://these/git/%7B%60%24%7BarchiveUrl%7D/static/%7Bthis.props.banner%7D?a=commitdiff_plain;h=fe56da16541185b03ee19d791c8145b05dd1392c;p=lemmy.git

Merge remote-tracking branch 'yerba/limit-memory'
---

fe56da16541185b03ee19d791c8145b05dd1392c