Merge branch 'feature/disable-config-management' into 'develop'
authorHaelwenn <git.pleroma.social@hacktivis.me>
Sat, 1 Sep 2018 21:47:35 +0000 (21:47 +0000)
committerHaelwenn <git.pleroma.social@hacktivis.me>
Sat, 1 Sep 2018 21:47:35 +0000 (21:47 +0000)
commite4079abab8245c5b5a0987fbce9ab7cfd724f2d5
tree1292015df9e419521d1a2fe814ec3397f671320f
parent2e2f4587050da652fb0c4b8822d912301a8be273
parente2ce0e9e05ad09797f18b1a6adff4616704a48cc
Merge branch 'feature/disable-config-management' into 'develop'

config: add ability to disable Pleroma FE config management (closes #276)

Closes #276

See merge request pleroma/pleroma!320