Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest...
authorRoman Chvanikov <chvanikoff@gmail.com>
Fri, 19 Apr 2019 16:27:13 +0000 (23:27 +0700)
committerRoman Chvanikov <chvanikoff@gmail.com>
Fri, 19 Apr 2019 16:27:13 +0000 (23:27 +0700)
commit73407f4eea7793c93981a87bb7eddef4f8daab7c
tree31dd745ec9cd8adf57bde7f3e6a2ffd9be3289ae
parentbc7862106d9881f858a58319e9e4b44cba1bcf01
parentcc93775ebf539598075c0b9afb96c60c8bede6b5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
config/config.exs