Merge branch 'fix_485' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sat, 29 Dec 2018 17:30:31 +0000 (17:30 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sat, 29 Dec 2018 17:30:31 +0000 (17:30 +0000)
commitf5d7b0003ea200d13abca2cbd4e4f59db9658231
treec83549d9d158ae125bbf84188bafbb15f085b2e2
parente8ba390fe9fdd033c2d373b9272cd25cbc032365
parentab9cda315f2ee7b0a2a6e505eface5d7c65d50b4
Merge branch 'fix_485' into 'develop'

Change 'name' to 'instance_name' so option is used when running non-interactive

See merge request pleroma/pleroma!607