Merge branch 'develop' into feature/custom-runtime-modules
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 9 Dec 2019 17:16:43 +0000 (00:16 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 9 Dec 2019 17:16:43 +0000 (00:16 +0700)
commitc098dec47344303bc00456bfbfc0d769abd8f199
tree709963edcda2d85a5d77ebce4a200ae04fff89cd
parent78299ab18205b0bbaf521640e188a862ca27aa61
parent0d2c13a119302d0d217a7cb61c28a01c620b1b61
Merge branch 'develop' into feature/custom-runtime-modules
CHANGELOG.md
config/config.exs
docs/configuration/cheatsheet.md
lib/pleroma/application.ex
lib/pleroma/web/endpoint.ex