Skip to content

Commit

Permalink
Merge pull request #43 ok
Browse files Browse the repository at this point in the history
update a pdf
  • Loading branch information
cedar-book committed Sep 27, 2018
2 parents 95090e5 + 5b44522 commit 4c6a0b1
Show file tree
Hide file tree
Showing 9 changed files with 4 additions and 4 deletions.
Binary file modified docs/_build/doctrees/environment.pickle
Binary file not shown.
Binary file modified docs/_build/doctrees/references/info_bbf_events.doctree
Binary file not shown.
Binary file modified docs/_build/html/_images/presen_docs/BitFest_BTS_Performance.pdf
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ BitFest Amsterdam 2018

:Peter Conrad: `BitShares Core & Network Performance <../_images/presen_docs/BitFest_BTS_Performance.pdf>`_
:Alfredo Garcia: `The Business of BitShares Plugins <../_images/presen_docs/BitFest_Business_Plugins.pdf>`_
:John M. Jones: Trustless Asset Swaps: BitShares and HTLC
:John M. Jones: `Trustless Asset Swaps: BitShares and HTLC <http://www.jmjatlanta.com/index.php/2018/09/27/bitshares-and-hashed-time-lock-contracts-htlc/>`_
:Fabian Schuh: Escrow Worker Management


Expand Down
Binary file modified docs/_build/html/objects.inv
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/_build/html/references/info_bbf_events.html
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ <h2>BitFest Amsterdam 2018<a class="headerlink" href="#bitfest-amsterdam-2018" t
</tr>
<tr class="field-even field"><th class="field-name">Alfredo Garcia:</th><td class="field-body"><a class="reference external" href="../_images/presen_docs/BitFest_Business_Plugins.pdf">The Business of BitShares Plugins</a></td>
</tr>
<tr class="field-odd field"><th class="field-name">John M. Jones:</th><td class="field-body">Trustless Asset Swaps: BitShares and HTLC</td>
<tr class="field-odd field"><th class="field-name">John M. Jones:</th><td class="field-body"><a class="reference external" href="http://www.jmjatlanta.com/index.php/2018/09/27/bitshares-and-hashed-time-lock-contracts-htlc/">Trustless Asset Swaps: BitShares and HTLC</a></td>
</tr>
<tr class="field-even field"><th class="field-name">Fabian Schuh:</th><td class="field-body">Escrow Worker Management</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/_build/html/searchindex.js

Large diffs are not rendered by default.

Binary file modified docs/images/presen_docs/BitFest_BTS_Performance.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/references/info_bbf_events.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ BitFest Amsterdam 2018

:Peter Conrad: `BitShares Core & Network Performance <../_images/presen_docs/BitFest_BTS_Performance.pdf>`_
:Alfredo Garcia: `The Business of BitShares Plugins <../_images/presen_docs/BitFest_Business_Plugins.pdf>`_
:John M. Jones: Trustless Asset Swaps: BitShares and HTLC
:John M. Jones: `Trustless Asset Swaps: BitShares and HTLC <http://www.jmjatlanta.com/index.php/2018/09/27/bitshares-and-hashed-time-lock-contracts-htlc/>`_
:Fabian Schuh: Escrow Worker Management


Expand Down

0 comments on commit 4c6a0b1

Please sign in to comment.