Merge branch 'develop' into 'feature/autofollowing'
authorfeld <feld@feld.me>
Tue, 27 Oct 2020 22:13:50 +0000 (22:13 +0000)
committerfeld <feld@feld.me>
Tue, 27 Oct 2020 22:13:50 +0000 (22:13 +0000)
commit03a318af9ac1cc86e1201d6f55babd06c0b5ecd9
tree1f45ec8d85a95ea677fc1e1a5e78f64e5241f36b
parente062329a177e1a1382cb3a44ef71e6d278b4963e
parent7d31122781c27e11e9e4ab62290cb772d64472d4
Merge branch 'develop' into 'feature/autofollowing'

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