Merge branch 'master' of https://github.com/jpetazzo/container.training into indexconf2018

This commit is contained in:
Bridget Kromhout
2018-02-21 18:10:04 -08:00

View File

@@ -67,7 +67,12 @@
<tr><td class="title" colspan="4">Coming soon at a conference near you</td></tr>
<tr>
<td><a class="attend" href="https://developer.ibm.com/indexconf/sessions/#!?id=5474" />February 22, 2018: IndexConf - Kubernetes 101</td>
<!--
<td>Nothing for now (stay tuned...)</td>
-->
<td>February 22, 2018: IndexConf — Kubernetes 101</td>
<td><a class="slides" href="http://indexconf2018.container.training/" /></td>
<td><a class="attend" href="https://developer.ibm.com/indexconf/sessions/#!?id=5474" />
</tr>
<tr><td class="title" colspan="4">Past workshops</td></tr>