Riccardo Spagni 9e669d3ac9 fix merge conflict

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

..

donate

added Symas as a sponsor

2016-08-24 17:54:45 +02:00

accepting.md

Knowledge-Base: update simplewallet to monero-wallet-cli

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

choose.md

added lightwallet java link

2016-02-17 18:29:27 +02:00

contribute.md

Add info on mining

2016-10-05 10:17:54 +02:00

index.md

Add a "How do I..." link from getting started to user guides

2016-10-22 14:36:13 +01:00

merchants.md

Revert "Multi lang"

2016-01-30 17:40:33 +02:00

running.md

Knowledge-Base: update bitmonerod to monerod

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