Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 8 Apr 2019 09:46:59 +0000 (16:46 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 8 Apr 2019 09:46:59 +0000 (16:46 +0700)
commitc3d5c3513a3205313f0a2e28bb328ad5b48f2055
tree09ec548304cf3bbabba5a3b216c2d6769c9a6525
parenta1a854646e96598473ed7a323e034cf1f88ca508
parentb177e1e7f330ff1531be190949db7f75e378a449
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
config/config.exs
docs/config.md
lib/pleroma/application.ex