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)
1  2 
config/config.exs

Simple merge