Skip to content

Commit

Permalink
Merge pull request #243 from devopsdays/bridget-migration
Browse files Browse the repository at this point in the history
Kiel updates

Former-commit-id: d1ab687
  • Loading branch information
bridgetkromhout committed May 6, 2016
2 parents e293eb8 + e4651f4 commit 9e99e05
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 9 deletions.
10 changes: 2 additions & 8 deletions content/events/2016-kiel/program.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,14 @@ type = "event"
<hr />


<!--
- [Harm Boertien](https://twitter.com/Harm_Ops)
-->

<div class="span-7 append-bottom border">

<div class="span-7 last">
<h4>Thursday May,12th 2016</h4>
</div>

<div class="span-2">08:00-09:00</div><div class="span-4 box last">Registration, Breakfast, and Sponsor Booths Open</div>
<div class="span-2">09:00-9:30</div><div class="span-4 box last"><p><strong>Opening Welcome</strong></p><p>Dr. Ulf Kämpfer, Mayor of the City of Kiel<br>Werner Kässens (KiWi)<br>Moderation:<br> Sabine Bernecker-Bendixen</p></div>
<div class="span-2">09:00-9:30</div><div class="span-4 box last"><p><strong>Opening Welcome</strong></p><p>Dr. Ulf Kämpfer, Mayor of the City of Kiel<br>Werner Kässens (KiWi)<br>Dr. Inge Schröder (Wissenschaftszentrum)<br>Moderation:<br> Sabine Bernecker-Bendixen</p></div>
<div class="span-2">09:30-10:10</div><div class="span-4 box last">
<p><strong>Oliver Siebenmarck</strong></p><p><a href="#desc1">From 0 to DevOps - Coping with Continuous Delivery to the Cloud</a></p>
</div>
Expand Down Expand Up @@ -133,8 +129,6 @@ type = "event"

<div class="span-2">15:40-16:10</div><div class="span-4 box last"><strong>Ignites</strong><br /><a href="#desc14">Scalable & clean build environments with Jenkins and Docker</a><br />
<i>Stefan Kahlhöfer</i><br /><br />
The empty talentpool<br />
<i>Harm Boertien</i><br /><br />
<a href="#desc18">Praise the "overwrite" - Why boring approaches are awesome!</a><br />
<i>Florian Sellmayr</i>
</div>
Expand All @@ -145,7 +139,7 @@ The empty talentpool<br />

<div class="span-2">17:10-17:45</div><div class="span-4 box last"><strong>Get together with AMA Panel</strong><br /><br />
Moderation:<br />
Willi Hasselbring<br />
Maik Wojcieszak<br />
Sabine Bernecker-Bendixen
</div>

Expand Down
2 changes: 1 addition & 1 deletion data/events/2016-kiel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ sponsors:
level: special
- id: wobe
level: special
- id: gradwork
- id: gradwerk
level: special
- id: coreadmin
level: silver
Expand Down
2 changes: 2 additions & 0 deletions data/sponsors/gradwerk.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name: "Digitalagentur Gradwerk GmbH"
url: "https://www.gradwerk.de"
Binary file modified static/img/sponsors/academicwork.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/gradwerk.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/img/sponsors/wobe.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 9e99e05

Please sign in to comment.