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)
commit60f213bb1a6b1627cd8f6bf2903a42c3f3827f1a
tree297f8ad25104db162b4431f887bb23b3e22255e2
parent05cdb2f2389376081973d96b32e876d2a032d1f1
parent6ca82c18a738205483dbbef2fd4de662d70227fb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
test/user_test.exs