Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
authorIvan Tashkinov <ivantashkinov@gmail.com>
Sat, 22 Feb 2020 06:31:43 +0000 (09:31 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Sat, 22 Feb 2020 06:31:43 +0000 (09:31 +0300)
commit8f0ca19b9cafeedc70df2d60bd7bd7c6bf7aa160
treef14a1ef01c90124b33b2866117ed2995e32ab369
parent0d14c3f41053f97d23fa9295745a817c08010969
parent114e7b764ed5ae03211cca40e7b19f33292b3d1c
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation

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