Merge branch 'pleroma-ctl-enchancements' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Fri, 11 Oct 2019 10:56:45 +0000 (10:56 +0000)
committerrinpatch <rinpatch@sdf.org>
Fri, 11 Oct 2019 10:57:30 +0000 (10:57 +0000)
commitfbbb032bc510e3097115ca37c4138d811c1d5912
treed97f1a50aa1fdd22c351e91214e0077cc62ea8e4
parentac113f672479320e77592239d2af5e0c4fcb1342
Merge branch 'pleroma-ctl-enchancements' into 'develop'

pleroma_ctl: Make it possible to specify branches/flavours when updating

See merge request pleroma/pleroma!1832

(cherry picked from commit 44afe4c8870d14ae2cd22ff5cfa04555cf5907bd)

b750135a pleroma_ctl: Make it possible to specify branches/flavours when updating
rel/files/bin/pleroma_ctl