Commit graph

1361 commits

Author SHA1 Message Date
Riccardo Spagni
fb0e85f4dc
fix merged conflicts 2016-09-19 21:41:24 +02:00
Riccardo Spagni
fe5bc2f9f0
Merge pull request #151
ffd0362 Update unlocktime.md (Christopher King)
2016-09-19 21:39:47 +02:00
Riccardo Spagni
70097f6c2f
Merge pull request #150
027f3a9 Added logs for the dev and Kovri meeting held on 2016-09-11 (dEBRUYNE-1)
2016-09-19 21:38:06 +02:00
Riccardo Spagni
1603f07717
Merge pull request #148
7048e6c added guide How-to-mine-Monero-XMR-without-a-mining-equipment (kenshirothefist)
2016-09-19 21:37:45 +02:00
Riccardo Spagni
3916758489
Merge pull request #147
9924edf Update view_only.md (Patrick Alexander)
2016-09-19 21:37:09 +02:00
EWBears
c127b0dd9e Update blockchain.md 2016-09-17 14:15:20 -04:00
Christopher King
ffd03626e7 Update unlocktime.md 2016-09-17 13:07:33 -04:00
dEBRUYNE-1
027f3a9fe1
Added logs for the dev and Kovri meeting held on 2016-09-11 2016-09-12 20:37:21 +02:00
kenshirothefist
7048e6ce51 added guide How-to-mine-Monero-XMR-without-a-mining-equipment 2016-09-11 22:44:54 +02:00
Patrick Alexander
9924edf851 Update view_only.md
Minor spelling and formatting change.  Formatting changed to properly display command line argument.
2016-09-06 12:05:13 -06:00
Riccardo Spagni
5eb88ba86d
Merge pull request #145
222d0a9 nestorgames (coolcodecrypto)
2016-09-05 16:54:13 +02:00
Riccardo Spagni
f87b2c4f0a
Merge pull request #143
fa65867 Update restore_account.md (Patrick Alexander)
2016-09-05 16:53:32 +02:00
Riccardo Spagni
4620e994bb
Merge pull request #141
20060f4 Livecoin (coolcodecrypto)
2016-09-05 16:53:15 +02:00
coolcodecrypto
222d0a96ff nestorgames
proof: https://twitter.com/nestorgames/status/771983691358801920
2016-09-05 09:34:05 +00:00
coolcodecrypto
9b5afbf08f Update merchants.yml 2016-09-05 09:29:55 +00:00
coolcodecrypto
25cd0d8477 LiteBit
new exchange
2016-09-05 09:26:23 +00:00
Patrick Alexander
fa65867149 Update restore_account.md
Change formatting of command line argument.
2016-09-02 15:53:04 -06:00
coolcodecrypto
20060f4ece Livecoin 2016-09-01 20:26:04 +00:00
Riccardo Spagni
8d7e797b33
fixed merchants, fixed meeting logs 2016-08-29 22:52:29 +02:00
Riccardo Spagni
9ffaa2361f
Merge pull request #136
ed72b69 Add logs for Dev and Kovri meeting held on 2016-08-28 (dEBRUYNE-1)
65a683c Add logs for the dev meeting on 2016-08-14 (dEBRUYNE-1)
2016-08-29 22:38:41 +02:00
Riccardo Spagni
9fceb6f5e8
Merge pull request #140
aa9d0cd BitMEX (coolcodecrypto)
2016-08-29 22:35:14 +02:00
Riccardo Spagni
0eb2023019
Merge pull request #138
9d58fcc CoinCut service - Buying Monero with fiat (GBP) (Stefanos Ioannou)
2016-08-29 22:34:42 +02:00
Riccardo Spagni
ef828f516c
Merge pull request #137
16a28e9 Update merchants.yml (coolcodecrypto)
2016-08-29 22:32:39 +02:00
dEBRUYNE-1
ed72b69bac
Add logs for Dev and Kovri meeting held on 2016-08-28 2016-08-29 21:23:23 +02:00
Riccardo Spagni
fbe3514979
added my Twitter handle to prevent scamming 2016-08-26 08:59:11 +02:00
Riccardo Spagni
eb71a22d05
added Symas as a sponsor 2016-08-24 17:54:45 +02:00
coolcodecrypto
aa9d0cdca9 BitMEX
BitMEX
2016-08-23 15:03:23 +00:00
Stefanos Ioannou
9d58fcca13 CoinCut service - Buying Monero with fiat (GBP)
Related blog post: http://blog.coincut.com/2016/08/17/buy-dash-ethereum-monero-gbp-wallets
2016-08-18 18:48:58 +03:00
coolcodecrypto
16a28e9ade Update merchants.yml
duplicate entry was deleted twice by mistake adding Web Developer - Stefanos listing again
2016-08-17 14:40:47 +00:00
dEBRUYNE-1
65a683ced2
Add logs for the dev meeting on 2016-08-14 2016-08-15 17:11:32 +02:00
Riccardo Spagni
501f05ffce
fix meeting logs 2016-08-14 20:05:54 +02:00
Riccardo Spagni
435f020cf4
fixed donators.yml utf-8 2016-08-14 19:42:55 +02:00
Riccardo Spagni
2c49ffe4b2 Merge branch 'cAP5L0CK-master' 2016-08-14 19:40:12 +02:00
Riccardo Spagni
b8edf5babc
fix conflicts 2016-08-14 19:39:49 +02:00
Riccardo Spagni
c711fb987f
fix broken menu 2016-08-14 19:19:50 +02:00
Riccardo Spagni
997ff4ec6c Merge pull request #129 from stefioan/patch-2
Duplicate entry on merchants.
2016-08-10 14:01:19 +02:00
Riccardo Spagni
72df1c4f54 Merge pull request #135 from dEBRUYNE-1/master
Add logs for the last two dev and Kovri meetings
2016-08-10 14:00:57 +02:00
Riccardo Spagni
0c18bda16b Merge pull request #134 from coolcodecrypto/patch-5
Update header.html
2016-08-10 14:00:52 +02:00
Riccardo Spagni
3d620dd27d Merge pull request #133 from coolcodecrypto/patch-4
Update merchants.yml
2016-08-10 14:00:47 +02:00
Riccardo Spagni
66b021d934 Merge pull request #132 from coolcodecrypto/patch-3
Update merchants.yml
2016-08-10 14:00:42 +02:00
dEBRUYNE-1
e8a7ae0c97
Add logs for the last two dev and Kovri meetings 2016-08-08 20:05:57 +02:00
coolcodecrypto
4f4e985ee1 Update header.html 2016-08-08 04:01:17 +00:00
coolcodecrypto
86ee37209c Update header.html
added stack exchange to community menu
2016-08-08 03:46:40 +00:00
coolcodecrypto
e4426724ca Update merchants.yml
added 2 explorers and 1 exchange listing
2016-08-08 03:29:52 +00:00
coolcodecrypto
1738ed9e96 Update merchants.yml
First farm to accept Monero!
https://www.reddit.com/r/Monero/comments/4wbh0t/the_tsunami_is_coming/d6689ht
2016-08-07 04:00:11 +00:00
coolcodecrypto
519dce0c43 Update merchants.yml
Added Infield loan services. Source was PM following this post:
https://redd.it/4wfu0o
2016-08-06 22:08:59 +00:00
coolcodecrypto
34dff10458 Update merchants.yml
removed duplicate web developer listing
2016-08-06 13:27:40 +00:00
coolcodecrypto
a2cead4947 Update merchants.yml
source for merchant addition: https://www.reddit.com/r/Monero/comments/4wbh0t/the_tsunami_is_coming/d6639g2
2016-08-06 13:06:22 +00:00
cAP5L0CK
2140128975 Changes to Donators 2016-07-25 08:37:37 -05:00
Stefanos Ioannou
182d3f6133 Duplicate entry.
Duplicate entry of "Web Developer - Stefanos".
2016-07-20 10:10:19 +03:00