Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
authorIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 20 Feb 2020 12:00:48 +0000 (15:00 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 20 Feb 2020 12:00:48 +0000 (15:00 +0300)
commit0c65a8c3d02a5a9dc3a0a54fef3b86130cf3c0dd
tree0e0f2ad4f7317b44e11f1df4d2e5fc9a301007e1
parent343229465753ebcc59002a2dd604a910a8ce462d
parente0b2de63853e9a14b72faddf6e1180a098728205
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation

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