Merge develop
authorRoman Chvanikov <chvanikoff@gmail.com>
Sat, 11 May 2019 07:45:54 +0000 (14:45 +0700)
committerRoman Chvanikov <chvanikoff@gmail.com>
Sat, 11 May 2019 07:45:54 +0000 (14:45 +0700)
commitf1f7a11222f4689f000825147d16b366d915f393
tree1a00e5c58bd1edfac01ca2cc9ac553e5ab7b92f0
parentb6b5b16ba4d65ecd9812b02d79f844548266eb8b
parent8d13c42926450aff6a0062f092cd1a5d59f99869
Merge develop
lib/pleroma/user.ex
mix.exs
mix.lock