Merge branch 'release-config-import' into 'develop'
authorlain <lain@soykaf.club>
Wed, 12 Jun 2019 09:58:16 +0000 (09:58 +0000)
committerlain <lain@soykaf.club>
Wed, 12 Jun 2019 09:58:16 +0000 (09:58 +0000)
commit822a9f28d08af9da69a8e0f72cc6511252f25ddd
treee0a6bac9e51f7eb96210ed55307cebb1f1014535
parent4265608097fea6611570409a14cec7b4daf01b51
parentf0d96534a4645f0996b3fab7ab5ba3b482fd4e23
Merge branch 'release-config-import' into 'develop'

Import release config from env variable or /etc/pleroma/config.exs and warn if the file is missing

See merge request pleroma/pleroma!1269