summaryrefslogtreecommitdiff
path: root/rel/files/bin
diff options
context:
space:
mode:
authorMaxim Filippov <colixer@gmail.com>2019-10-15 17:33:29 +0200
committerMaxim Filippov <colixer@gmail.com>2019-10-15 17:33:29 +0200
commitda0e4879bcd12849182a39445174384420fcf064 (patch)
treebf54d1b4ee868b187a66948993babe86350840c2 /rel/files/bin
parentc0aca32dd0aed522cfc537cc88b77f7ff254946b (diff)
parent3b1bc079af8fb6e467a9114de0d32e2de59a7fab (diff)
downloadpleroma-da0e4879bcd12849182a39445174384420fcf064.tar.gz
pleroma-da0e4879bcd12849182a39445174384420fcf064.zip
DELETE /api/pleroma/admin/users now accepts nicknames array
Diffstat (limited to 'rel/files/bin')
-rwxr-xr-xrel/files/bin/pleroma_ctl4
1 files changed, 2 insertions, 2 deletions
diff --git a/rel/files/bin/pleroma_ctl b/rel/files/bin/pleroma_ctl
index f767fe134..90f87a990 100755
--- a/rel/files/bin/pleroma_ctl
+++ b/rel/files/bin/pleroma_ctl
@@ -35,11 +35,11 @@ detect_branch() {
if [ "$branch" = "develop" ]; then
echo "develop"
elif [ "$branch" = "" ]; then
- echo "master"
+ echo "stable"
else
# Note: branch name in version is of SemVer format and may only contain [0-9a-zA-Z-] symbols —
# if supporting releases for more branches, need to ensure they contain only these symbols.
- echo "Releases are built only for master and develop branches" >&2
+ echo "Can't detect the branch automatically, please specify it by using the --branch option." >&2
exit 1
fi
}