Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

devopsdays 2016 AMS - Post program launch updates #392

Merged
merged 4 commits into from
May 19, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 modified static/events/2016-amsterdam/speakers/pavel-chunyayev.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/events/2016-amsterdam/speakers/takahiko-ito.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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.