Skip to content

Commit

Permalink
Merge pull request rchain#34 from patrick727/patch-7
Browse files Browse the repository at this point in the history
Update README.md
  • Loading branch information
n10n authored Jan 17, 2018
2 parents 2f733f1 + 577015c commit fcf6b3a
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ Here's a collection of useful links at an easy to remember uri.

* [RChain Developer Wiki](https://rchain.atlassian.net/wiki/spaces/CORE/overview)

* [A Rholang Tutorial: 2018-01-16](https://github.com/rchain/rchain/blob/dev/rholang/doc/rholangtut-mercury.md)

* [Rholang Spec (0.1): 2016-08-03](https://docs.google.com/document/d/1gnBCGe6KLjYnahktmPSm_-8V4jX53Zk10J-KFQl7mf8/edit)

* [Notes on the DAO re-entrancy bug: 2016-09-01](https://docs.google.com/document/d/1sGlObhGhoEizBXC30Ww4h1KHKGkmcy4NiCKitIBqiUg/edit?usp=sharing)
Expand All @@ -40,6 +42,7 @@ Here's a collection of useful links at an easy to remember uri.

* [RChain Developer Retreat (Playlist): 2017-11-07](https://www.youtube.com/watch?v=Fs38s7nI3Uk&list=PLf2bbiic5ZjCPzin3gCSMGiBtbT8UO5o2)
* [Introduction to Rholang at Devcon3: 2017-11-26](https://www.youtube.com/watch?v=7tW1fAWg6s8)
* [Epicenter with Peter Harris of Resonate | 2017-01-24](https://www.youtube.com/watch?v=kXC0KFrTxpg)
* [RChain Live Stream AMA w/ Ed Eykholt: 2017-09-27](https://www.youtube.com/watch?v=_gBElYHnDSA&t=3s)
* Seattle Ethereum Presentation: 2017-01-30 [(video)](https://youtu.be/3kyXqchEdLc) [(slides)](https://drive.google.com/file/d/0B5I9qM5f_1cfMjY0bVgwTVFvLWM/view)

Expand Down

0 comments on commit fcf6b3a

Please sign in to comment.