Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
authorIvan Tashkinov <ivant.business@gmail.com>
Wed, 27 Mar 2019 12:41:40 +0000 (15:41 +0300)
committerIvan Tashkinov <ivant.business@gmail.com>
Wed, 27 Mar 2019 12:41:40 +0000 (15:41 +0300)
commit20e0f3660541f19cf878b789aa9f5b9d5ce8cddb
tree08cb90d62e431beb7ee6a2261dc679b725aec1f1
parent2a95014b9d7142aa2549e70f428293af78fae8eb
parent15aa94f40f73444d67da7cb71ec219b97ec5142e
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
config/config.exs
lib/pleroma/user.ex
mix.exs
mix.lock