Merge branch 'develop' into 'feature/autofollowing'
authorfeld <feld@feld.me>
Tue, 27 Oct 2020 17:42:24 +0000 (17:42 +0000)
committerfeld <feld@feld.me>
Tue, 27 Oct 2020 17:42:24 +0000 (17:42 +0000)
commite062329a177e1a1382cb3a44ef71e6d278b4963e
tree1d98291af1a0d0c64794bc2b4e13ee7e62c634bc
parentd16336e7fbf7851ee5f50a17747067f2be741581
parent2f7401806bbe5427bbcaa7cdce35130320ae3bb4
Merge branch 'develop' into 'feature/autofollowing'

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