Skip to content

Conversation

@fanquake
Copy link
Member

Backports #15684, #15792, #15802, #15809 to the 0.18 branch.

@maflcko
Copy link
Member

maflcko commented Apr 15, 2019

Could include #15799?

@fanquake
Copy link
Member Author

Could include #15799?

Added.

@jonatack
Copy link
Member

Possibly wait for #15607 if it makes it in :)

@maflcko
Copy link
Member

maflcko commented Apr 16, 2019

@jonatack maintainer processes are only relevant (or sufficient) on the master branch

@laanwj laanwj merged commit a644780 into bitcoin:0.18 Apr 18, 2019
laanwj added a commit that referenced this pull request Apr 18, 2019
a644780 doc: Clarify RPC versioning (MarcoFalke)
194226f doc: describe onlynet option in doc/tor.md (Jon Atack)
6d2448c doc/dependencies: Fix typo libsrvg->librsvg (Luke Dashjr)
9c572e3 doc: mention creating application support bitcoin folder on OSX (Jack Mallers)
c69138a gitignore: add *.plist (clang-check) (James O'Beirne)
8f7cfb0 gitignore: add *.dat (James O'Beirne)

Pull request description:

  Backports #15684, #15792, #15802,  #15809 to the `0.18` branch.

ACKs for commit a64478:

Tree-SHA512: 6ed524a7b94242f8a738710d4321b98b9e80d6625d384fd83280b38fcb6bb8c468bcec1d980789ad2f4c91a5629ffe5c5314a7353181f08884c5a081840431cc
@fanquake fanquake deleted the 0.18-doc-backports branch April 27, 2019 00:45
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Dec 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants