Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'
authorfeld <feld@feld.me>
Thu, 13 Feb 2020 14:37:55 +0000 (14:37 +0000)
committerfeld <feld@feld.me>
Thu, 13 Feb 2020 14:37:55 +0000 (14:37 +0000)
commitb312c36b8e14b6aaa450bd8509e320c9784d0f48
tree970f7522951f583f100f682142d7aa1b4e1082c3
parent571a475c7ec8f9bb6e3a252aa7c3c65a1621bed6
parent0db88f547b371fb480148279278bd081e5929003
Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'

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