Merge remote-tracking branch 'upstream-pull/945/head'

This commit is contained in:
Saivann 2015-07-05 23:37:35 -04:00
commit 44992f6674
No known key found for this signature in database
GPG key ID: 5780F5D31B5577B0

View file

@ -70,6 +70,14 @@
country: "Brazil"
link: "http://www.bitconf.com.br"
- date: 2015-07-18
title: "avalBit: Pay Paella with bitcoin "
venue: "Polígono Industrial Plá dels Olivars"
address: "Av espinoca"
city: "Valencia"
country: "Spain"
link: "http://avalbit.org/actividades/evento-pagar-paella-birras-y-bitcoins/"
- date: 2015-07-28
title: "Digital Currencies + The Blockchain"
venue: "Convene"
@ -86,6 +94,14 @@
country: "United States"
link: "http://www.keynote2015.com/"
- date: 2015-08-05
title: "Bitcoin Wednesday #26"
venue: "VondelCS: The media, culture and broadcasting center in Amsterdam for national broadcaster AVROTROS."
address: "Vondelpark 3"
city: "Amsterdam"
country: "The Netherlands"
link: "http://www.bitcoinwednesday.com/event/bitcoin-wednesday-26/"
- date: 2015-08-13
title: "Coin Congress San Francisco 2015"
venue: "Hilton Union Square - San Francisco"