[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
authorIvan Tashkinov <ivant.business@gmail.com>
Thu, 4 Apr 2019 20:43:08 +0000 (23:43 +0300)
committerIvan Tashkinov <ivant.business@gmail.com>
Thu, 4 Apr 2019 20:43:08 +0000 (23:43 +0300)
commit45765918c377c6daf8ee8e5bfad4ea24f67766b6
treea8ccea9436d7c533a481939a4724c62d8ffac4c0
parentf7cd9131d4aa0da3c4c0174acc56ce1bbdbd284c
parent9c9eec62c2fb67507708dd9e5d3f80a098881a6e
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

# Conflicts:
# mix.exs
config/config.exs
lib/pleroma/user.ex
mix.exs
mix.lock