summary refs log tree commit diff
path: root/scripts-dev
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-09-06 15:41:37 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-09-06 15:41:37 +0100
commite163df4c204af42ba579963c52dca93a1841d2f0 (patch)
tree5ed179c92caaef8a78d526987dcb8b0a6a2917ee /scripts-dev
parentDon't process revoked/redacted events as part of the room's membership info (diff)
parentMerge pull request #1 from matrix-org/babolivier/direct-avatar-name (diff)
downloadsynapse-e163df4c204af42ba579963c52dca93a1841d2f0.tar.xz
Merge branch 'dinsic' into babolivier/dinsic-3pid-invite
Diffstat (limited to 'scripts-dev')
-rwxr-xr-xscripts-dev/check-newsfragment6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts-dev/check-newsfragment b/scripts-dev/check-newsfragment

index 0ec5075e79..b8a85abe18 100755 --- a/scripts-dev/check-newsfragment +++ b/scripts-dev/check-newsfragment
@@ -5,9 +5,9 @@ set -e -# make sure that origin/develop is up to date -git remote set-branches --add origin develop -git fetch origin develop +# make sure that origin/dinsic is up to date +git remote set-branches --add origin dinsic +git fetch origin dinsic # if there are changes in the debian directory, check that the debian changelog # has been updated