mirror of
https://github.com/seigler/dash-docs
synced 2025-07-28 02:06:13 +00:00
Merge remote-tracking branch 'refs/remotes/bitcoin-dot-org/master' into capacity-increases
# Conflicts: # zh_CN/bitcoin-core/capacity-increases.md # zh_TW/bitcoin-core/capacity-increases.md
This commit is contained in:
commit
d59b8fcc1c
14 changed files with 411 additions and 29 deletions
|
@ -17,7 +17,11 @@ breadcrumbs:
|
|||
|
||||
我们连署支持 [比特币系统扩展][1] 路线图。我们已在Bitcoin Core计划内为可扩展性工作多年,认为这是最可以延续我们一直以来努力的方向。
|
||||
|
||||
<<<<<<< HEAD
|
||||
有关更多详情请参阅 [常见问题解答][FAQ]。
|
||||
=======
|
||||
有关更多详情请参阅 [常见问题解答][FAQ],中文版本正在准备中。
|
||||
>>>>>>> refs/remotes/bitcoin-dot-org/master
|
||||
|
||||
{% include bitcoin-core/capability-increases-sigs.md %}
|
||||
|
||||
|
@ -26,4 +30,8 @@ breadcrumbs:
|
|||
如果你想参与连署,请到[#1165](https://github.com/bitcoin-dot-org/bitcoin.org/pull/1165)。
|
||||
|
||||
[1]: https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-December/011865.html
|
||||
<<<<<<< HEAD
|
||||
[FAQ]: /zh_CN/bitcoin-core/capacity-increases-faq
|
||||
=======
|
||||
[FAQ]: /en/bitcoin-core/capacity-increases-faq
|
||||
>>>>>>> refs/remotes/bitcoin-dot-org/master
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue