Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2018-04-26 12:06:41 +00:00
commit a17a9521b4

View File

@ -7,6 +7,15 @@
set -e
orig_args=$@
# chomp any args starting with '-' as these need to go
# through to the release script and otherwise we'll get
# confused about what the version arg is.
while [[ "$1" == -* ]]; do
shift
done
cd `dirname $0`
for i in matrix-js-sdk matrix-react-sdk
@ -38,4 +47,4 @@ git commit package.json -m "$tag"
cd ..
exec ./node_modules/matrix-js-sdk/release.sh -z "$@"
exec ./node_modules/matrix-js-sdk/release.sh -z "$orig_args"