Merge branch 'develop' into use-jobs-in-webpush
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 8 Apr 2019 09:29:20 +0000 (16:29 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 8 Apr 2019 09:29:20 +0000 (16:29 +0700)
commita1a854646e96598473ed7a323e034cf1f88ca508
tree4a427437c7c444fdfd2bb99dc012a7008d9bb0fe
parent1c2e4f88d1a707791818014f8bcdedd986c2fa75
parentfb2040d06199f2f4190ff363da54d6fcfa87ff69
Merge branch 'develop' into use-jobs-in-webpush
config/config.exs
lib/pleroma/application.ex