From: feld <feld@feld.me>
Date: Thu, 13 Feb 2020 14:37:55 +0000 (+0000)
Subject: Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=b312c36b8e14b6aaa450bd8509e320c9784d0f48;p=akkoma

Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'

# Conflicts:
#   config/description.exs
---

b312c36b8e14b6aaa450bd8509e320c9784d0f48