diff --git a/_events/2014-03-06-texasbitcoinconference.md b/_events/2014-03-06-texasbitcoinconference.md index dbfdfd55..939d6eb9 100644 --- a/_events/2014-03-06-texasbitcoinconference.md +++ b/_events/2014-03-06-texasbitcoinconference.md @@ -1,6 +1,6 @@ --- title: "2014 Texas Bitcoin Conference" -city: "Austin" +city: "Austin, TX" country: "United States" link: "http://texasbitcoinconference.com/" --- diff --git a/_events/2014-03-20-commercism.md b/_events/2014-03-20-commercism.md new file mode 100644 index 00000000..0a7bd770 --- /dev/null +++ b/_events/2014-03-20-commercism.md @@ -0,0 +1,6 @@ +--- +title: "Commercism Bitcoinference" +city: "Mountain View, CA" +country: "United States" +link: "http://commercism.co/bitcoin" +--- diff --git a/_events/2014-03-25-coinsummit.md b/_events/2014-03-25-coinsummit.md new file mode 100644 index 00000000..6a671604 --- /dev/null +++ b/_events/2014-03-25-coinsummit.md @@ -0,0 +1,6 @@ +--- +title: "CoinSummit" +city: "San Francisco, CA" +country: "United States" +link: "http://www.coinsumm.it/" +--- diff --git a/_events/2014-04-07-insidebitcoinsnyc2014 b/_events/2014-04-07-insidebitcoinsnyc2014 index 27e048ce..0ec656fb 100644 --- a/_events/2014-04-07-insidebitcoinsnyc2014 +++ b/_events/2014-04-07-insidebitcoinsnyc2014 @@ -1,6 +1,6 @@ --- title: "Inside Bitcoins NYC" city: "New York, NY" -country: "USA" +country: "United States" link: "http://www.mediabistro.com/insidebitcoins/new-york/?c=bcoinnybcorg" --- diff --git a/_events/2014-04-11-expo.md b/_events/2014-04-11-expo.md index 4bd748fb..26b8c0db 100644 --- a/_events/2014-04-11-expo.md +++ b/_events/2014-04-11-expo.md @@ -1,6 +1,6 @@ --- title: "Bitcoin Expo 2014" -city: "Toronto, Ontario" +city: "Toronto, ON" country: "Canada" link: "http://www.bitcoinexpo.ca/" --- diff --git a/_events/2014-05-15-bitcoin2014 b/_events/2014-05-15-bitcoin2014 new file mode 100644 index 00000000..e18a2bef --- /dev/null +++ b/_events/2014-05-15-bitcoin2014 @@ -0,0 +1,6 @@ +--- +title: "Bitcoin Foundation Bitcoin 2014" +city: "Amsterdam" +country: "Netherlands" +link: "http://www.bitcoin2014.com/" +--- diff --git a/_events/2014-08-25-campbitcoin.md b/_events/2014-08-25-campbitcoin.md index a25bfae0..7a3c82e7 100644 --- a/_events/2014-08-25-campbitcoin.md +++ b/_events/2014-08-25-campbitcoin.md @@ -1,6 +1,6 @@ --- title: "Camp Bitcoin" -city: "Black Rock City, Nevada" +city: "Black Rock City, NV" country: "United States" link: "http://campbitcoin.hivewallet.com/" ---