70 commits

Author	SHA1	Message	Date
Riccardo Spagni	b6db8033d8	Merge pull request #40 from cAP5L0CK/master ... Update Donators	2015-06-26 01:17:01 +02:00
Riccardo Spagni	ea43392794	updated donors	2015-06-14 17:24:30 +02:00
cAP5L0CK	117080cd11	Update Donators ... Add 280 from medusa	2015-06-08 14:35:55 -05:00
Riccardo Spagni	e0e591fcd9	Merge pull request #38 from cAP5L0CK/master ... Update Donators	2015-06-05 10:39:27 +02:00
cAP5L0CK	979e1997d2	Update Donators ... Added G2M	2015-06-04 17:33:27 -05:00
Riccardo Spagni	bfa0525486	updated donators	2015-06-04 09:11:43 +02:00
Riccardo Spagni	0af5aacd2f	Merge pull request #37 from cAP5L0CK/master ... Update Donators	2015-06-04 09:10:33 +02:00
cAP5L0CK	827d9a1690	Update Donators ... Added two new donations	2015-06-02 07:57:13 -05:00
Mart Roosmaa	3b14e13b24	Add #monero-otc to exchanges.	2015-05-30 22:17:17 +02:00
Mart Roosmaa	8ebd200fe1	Move MoneroClub to exchanges section.	2015-05-30 22:17:17 +02:00
Mart Roosmaa	9db7e9e56c	Add HitBTC to exchanges.	2015-05-30 22:17:17 +02:00
Mart Roosmaa	b09aeade13	Add Bter to exchanges.	2015-05-30 22:17:17 +02:00
Mart Roosmaa	a770d78d2f	Add MoneroPrice.com to Tools.	2015-05-30 22:17:17 +02:00
Mart Roosmaa	ed8d4ddf41	Add SafeDice to entertainment.	2015-05-30 22:17:17 +02:00
Mart Roosmaa	22f1448197	Add Crypto Kingdom to entertainment.	2015-05-30 22:17:16 +02:00
Mart Roosmaa	5fa456985e	Add CryptoName to services.	2015-05-30 22:17:16 +02:00
Mart Roosmaa	3c161cf0a5	Add XMR.link to services.	2015-05-30 22:17:16 +02:00
Mart Roosmaa	dee0a36e0a	Add ShapeShift to exchanges.	2015-05-30 22:17:16 +02:00
Mart Roosmaa	f38b4351b7	Add ChainRadar to block explorers.	2015-05-30 09:48:56 +02:00
Mart Roosmaa	66cee073eb	Order merchants in alphabetical order.	2015-05-30 09:45:35 +02:00
Mart Roosmaa	03e275162a	Remove defunct Melotic exchange.	2015-05-30 09:41:09 +02:00
Riccardo Spagni	73f6abd19c	Merge pull request #35 from cAP5L0CK/master ... Updated Donators	2015-05-15 18:35:26 +02:00
cAP5L0CK	06d86c62ae	Updated Donators ... Fix Quantum's donation to be under palexander	2015-05-14 11:49:18 -05:00
Riccardo Spagni	67946a0c8a	Merge pull request #34 from cAP5L0CK/master ... Master	2015-05-12 20:54:51 +02:00
cAP5L0CK	a43417fb73	Update Donators ... QuantumQrack and ajiekceu4 added	2015-05-11 11:30:47 -05:00
cAP5L0CK	062ecfbd39	Updated Donators ... ibuyltc and bassica updates	2015-05-11 10:07:37 -05:00
Riccardo Spagni	fd19203a35	Merge pull request #32 from cAP5L0CK/master ... Update Donators	2015-04-29 20:30:09 +02:00
cAP5L0CK	f27e4d149b	Update Donators ... GreekBitcoin and GingerAle donations	2015-04-29 09:58:15 -05:00
Riccardo Spagni	3b42563257	Merge branch 'master' of https://github.com/monero-project/monero-site	2015-04-24 09:00:16 +02:00
Riccardo Spagni	c4a06008e2	added old missives	2015-04-24 08:56:22 +02:00
Riccardo Spagni	7e4c6048bf	Merge pull request #30 from cAP5L0CK/master ... Update Donators	2015-04-20 14:27:04 +02:00
cAP5L0CK	e855f4d223	Update Donators ... Monero Birthday Editions	2015-04-20 07:24:32 -05:00
Riccardo Spagni	48f3a37834	Merge pull request #29 from cAP5L0CK/master ... Added palexander	2015-04-08 09:52:57 +02:00
Riccardo Spagni	0437224470	added merchants	2015-04-06 09:48:37 +02:00
cAP5L0CK	a607173ffa	Added palexander ... Added palexander with 50 coin donation	2015-04-03 08:38:16 -05:00
Riccardo Spagni	558fe55ac7	fixed djjacket's formatting in donators	2015-04-02 13:15:44 +02:00
Riccardo Spagni	c4f8e135da	updated lloydmiller's amount	2015-03-31 19:11:50 +02:00
Riccardo Spagni	98eae0c9bc	Merge pull request #23 from cAP5L0CK/master ... Adition and fixes	2015-03-30 20:16:11 +02:00
cAP5L0CK	711d23a239	Adition and fixes ... Various additions fixed a bug in raska's history.	2015-03-27 13:08:50 -05:00
Riccardo Spagni	062ae41f50	Merge pull request #21 from cAP5L0CK/master ... Updated IOURZZZ's donation	2015-03-20 09:25:26 +02:00
cAP5L0CK	177fd01830	Updated IOURZZZ's donation ... +136	2015-03-17 09:45:23 -05:00
Riccardo Spagni	b1dcbb08f5	fixed cryptonit -> cryptonic	2015-03-15 15:39:40 +02:00
Riccardo Spagni	ba15df718e	removed cryptocoins-dice	2015-03-14 09:57:20 +02:00
Riccardo Spagni	b98f75dafe	Merge pull request #18 from davidlatapie/patch-5 ... New section and, website, grammar question	2015-03-12 15:46:28 +02:00
David	512deb0e3f	Update merchants.yml ... Change of wording "Physical Monero and Bitcoin coins"	2015-03-12 14:44:41 +01:00
Riccardo Spagni	2154eebb4a	Merge pull request #19 from cAP5L0CK/master ... Updated Lloyd Miller with the Paypal donation	2015-03-12 14:32:21 +02:00
cAP5L0CK	fd9fe7f6f4	Updated Lloyd Miller with the Paypal donation	2015-03-12 07:26:58 -05:00
David	f6e2ec68a6	New section and, website, grammar question ... Added Goods after discussion with fluffypony Added cryptonit.net under this section Used the esperanto form of monero. This has implication, because so far we avoided the matter of choosing because we avoided the plural. This doesn't mean only English plural or only Esperanto plural is accepted - both could, like both color and colours are accepted. Still, style-wise, it is better to stick to one word (color everywhere or colour everywhere) so this question still remains for -s vs -j.	2015-03-12 10:21:24 +01:00
Riccardo Spagni	dfef0f7e9f	add forkguard to merchants and services	2015-03-12 08:31:49 +02:00
Riccardo Spagni	1a530f0dc6	fixed relative paths in CSS	2015-03-06 11:38:27 +02:00