diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-12-11 15:43:20 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-12-11 15:43:20 +0000 |
| commit | f208f608cbd7a203dd3d427508614083e438f2cc (patch) | |
| tree | 6d983950a8f8fa9cddfe8cae5f78669ff14ca376 /.circleci | |
| parent | Add 'sandbox' to CSP for media repo (#4284) (diff) | |
| parent | 0.34.0rc2 (diff) | |
| download | synapse-f208f608cbd7a203dd3d427508614083e438f2cc.tar.xz | |
Merge branch 'release-v0.34.0' into develop
Diffstat (limited to '.circleci')
| -rwxr-xr-x | .circleci/merge_base_branch.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.circleci/merge_base_branch.sh b/.circleci/merge_base_branch.sh index b2c8c40f4c..4c19fa70d7 100755 --- a/.circleci/merge_base_branch.sh +++ b/.circleci/merge_base_branch.sh @@ -20,7 +20,7 @@ else fi # Show what we are before -git show -s +git --no-pager show -s # Set up username so it can do a merge git config --global user.email bot@matrix.org @@ -31,4 +31,4 @@ git fetch -u origin $GITBASE git merge --no-edit origin/$GITBASE # Show what we are after. -git show -s +git --no-pager show -s |