Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest...
authorRoman Chvanikov <chvanikoff@gmail.com>
Wed, 17 Apr 2019 09:58:08 +0000 (16:58 +0700)
committerRoman Chvanikov <chvanikoff@gmail.com>
Wed, 17 Apr 2019 09:58:08 +0000 (16:58 +0700)
commit87013f843853250e8b15696900e09afb92d22aac
tree72491ebe110dbd191485a5f7aa1b80e6359e848b
parentdc21181f6504b55afa68de63f170fcb0f1084a6b
parent8de17c480e4267a46ae8d862a3c8918aa6734c39
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email