joshua/dash-docs
1
0
Fork 0
mirror of https://github.com/seigler/dash-docs synced 2025-07-27 09:46:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'refs/remotes/bitcoin-dot-org/master' into capacity-increases

Browse source 
# Conflicts:
#	zh_CN/bitcoin-core/capacity-increases.md
#	zh_TW/bitcoin-core/capacity-increases.md
This commit is contained in:
Johnson Lau 2016-01-01 01:32:28 +08:00
commit d59b8fcc1c
14 changed files with 411 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

8
zh_TW/bitcoin-core/capacity-increases.md
View file

@ -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 @@ Core計劃內為可擴展性工作多年，認為這是最可以延續我們一
如果你想參與連署，請到[#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_TW/bitcoin-core/capacity-increases-faq
=======
[FAQ]: /en/bitcoin-core/capacity-increases-faq
>>>>>>> refs/remotes/bitcoin-dot-org/master