Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest...
authorRoman Chvanikov <chvanikoff@gmail.com>
Sat, 20 Apr 2019 12:43:06 +0000 (19:43 +0700)
committerRoman Chvanikov <chvanikoff@gmail.com>
Sat, 20 Apr 2019 12:43:06 +0000 (19:43 +0700)
1  2 
test/user_test.exs

Simple merge