Skip to content

Commit

Permalink
Merge pull request #392 from yvovandoorn/yvovandoorn/PostProgramLaunc…
Browse files Browse the repository at this point in the history
…hUpdates

devopsdays 2016 AMS - Post program launch updates
  • Loading branch information
Yvo committed May 19, 2016
2 parents 397a283 + fa43804 commit a1e3272
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion content/events/2016-amsterdam/workshops.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ tags = ["amsterdam","amsterdam-2016"]
<div class="span-15 box-green centerstyle"><h4>08:00-09:00 Registration and Breakfast</h4></div>
<div>
<div class="box-orange span-15 centerstyle"><h4><b>09:00 - 11:30</b> Workshop Schedule </h4></div>
<div class="box-blue span-15"><a href="/events/2016-amsterdam/workshops/nati-cohen">Avishai Ish-Shalom (FewBytes) & Nati Cohen (Independent) <br /> Docker From Scratch</a></div>
<div class="box-blue span-15"><a href="/events/2016-amsterdam/workshops/nati-cohen">Avishai Ish-Shalom (FewBytes) & Nati Cohen (SimilarWeb) <br /> Docker From Scratch</a></div>
<div class="box-gray span-15"><a href="/events/2016-amsterdam/workshops/christoph-andreas-torlinsky">Christoph Andreas Torlinsky (Nuage Networks) <br /> A Place for SDN in DevOps</a></div>
<div class="box-blue span-15"><a href="/events/2016-amsterdam/workshops/dave-van-herpen">Dave van Herpen & Robert den Broeder (Sogeti) <br /> Creating high-performance teams with DevOps behavior</a></div>
<div class="box-gray span-15"><a href="/events/2016-amsterdam/workshops/remi-bergsma">Remi Bergsma & Fred Neubauer (Schuberg Philis) <br /> Cloudstack / Cosmic Cloud</a></div>
Expand Down
2 changes: 2 additions & 0 deletions data/events/2016-amsterdam.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ sponsors:
level: silver
- id: redhat
level: silver
- id: workiva
level: silver
# bronze
- id: beslist
level: bronze
Expand Down
2 changes: 2 additions & 0 deletions data/sponsors/workiva.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name: "Workiva"
url: "http://www.workiva.com/"
Binary file added static/img/sponsors/workiva.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a1e3272

Please sign in to comment.