Riccardo Spagni 9e669d3ac9 fix merge conflict

2016-10-29 10:50:05 +02:00

..

developer-guides

Knowledge-Base: update bitmonerod to monerod

2016-10-20 13:40:34 +00:00

moneropedia

Merge pull request #186

2016-10-29 10:48:13 +02:00

user-guides

fix merge conflict

2016-10-29 10:50:05 +02:00

about2.md

about2

2015-08-04 06:55:02 -04:00

about.md

Merge pull request #185

2016-10-29 10:47:50 +02:00

openalias.md

make the link clickable

2016-10-09 18:33:16 +02:00

people.md

added my Twitter handle to prevent scamming

2016-08-26 08:59:11 +02:00

projects.md

crypto-kingdom extra details

2016-02-01 21:33:11 +02:00

protocol_explanation.md

formatting-improvements-protocol_explanation.md

2016-02-01 21:54:51 +02:00