Merge pull request #114 from bridgetkromhout/master

Adding upcoming events
This commit is contained in:
Jérôme Petazzoni
2018-02-27 09:28:27 -06:00
committed by GitHub

View File

@@ -67,9 +67,22 @@
<tr><td class="title" colspan="4">Coming soon at a conference near you</td></tr>
<tr>
<td>Nothing for now (stay tuned...)</td>
<!--
<td>Nothing for now (stay tuned...)</td>
thing for now (stay tuned...)</td>
-->
<td>March 14, 2018: Boosterconf — Kubernetes 101</td>
<td>&nbsp;</td>
<td><a class="attend" href="https://2018.boosterconf.no/talks/1179" />
</tr>
<tr>
<td>March 27, 2018: SREcon Americas — Kubernetes 101</td>
<td>&nbsp;</td>
<td><a class="attend" href="https://www.usenix.org/conference/srecon18americas/presentation/kromhout" />
</tr>
<tr><td class="title" colspan="4">Past workshops</td></tr>
<tr>