Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 8 Apr 2019 11:48:10 +0000 (18:48 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 8 Apr 2019 11:48:10 +0000 (18:48 +0700)
commit9abf832b034bf3867272bd178d168c641129eff0
treedecc2cc28908a79df003ad668fb06cb74fa97159
parentc3d5c3513a3205313f0a2e28bb328ad5b48f2055
parente19590c93f9adc5d743867b048aad9528810fc53
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
config/config.exs
docs/config.md