Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest...
authorRoman Chvanikov <chvanikoff@gmail.com>
Sun, 14 Apr 2019 07:05:21 +0000 (14:05 +0700)
committerRoman Chvanikov <chvanikoff@gmail.com>
Sun, 14 Apr 2019 07:05:21 +0000 (14:05 +0700)
commit0cd4b6024d043efb096a353d6bd84ea0aeb74a6f
tree359bbd63d213dbbf4c798a86e8804eaf6f047234
parent371a4aed2ca9f6926e49f6791c8b4d14292d20e5
parent7304e0ce18776d4ace969a8a1b737a60635376d6
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email