Merge branch 'develop' into feature/digest-email
authorRoman Chvanikov <chvanikoff@pm.me>
Sat, 20 Jul 2019 13:41:58 +0000 (16:41 +0300)
committerRoman Chvanikov <chvanikoff@pm.me>
Sat, 20 Jul 2019 13:41:58 +0000 (16:41 +0300)
commit8292331b35f088a19a4d14eff69b74a6d1ed4746
tree3a4f85b315f299b59c36cbdb3f8830a4923c11da
parentae4fc58589ac48a0853719e6f83b2559b6de44fb
parentfe548f322e834c7c81678a460c54c71f1198021c
Merge branch 'develop' into feature/digest-email
CHANGELOG.md
lib/pleroma/user.ex