Skip to content

Commit

Permalink
Merge pull request #101 from dragoonis/feature/schedule-shift
Browse files Browse the repository at this point in the history
Shifting Robert for Phil on the schedule
  • Loading branch information
maxmanders committed Mar 14, 2013
2 parents 7f67ca6 + ef7ee58 commit d3168f7
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions schedule.html
Expand Up @@ -45,7 +45,7 @@ <h3 class="light">Day One - April 12<sup>th</sup></h3>
</tr>
<tr>
<td class="time">14:00</td>
<td><a href="/speakers.html#phil">Real Time Web Apps in the Wild</a> - <a href="https://twitter.com/leggetter">Phil Leggetter</a></td>
<td><a href="/speakers.html#robert">Bringing the open web and APIs to mobile devices with Firefox OS</a> - <a href="https://twitter.com/robertnyman">Robert Nyman</a></td>
<td><a href="/speakers.html#rowan">Building Better Developers</a> - <a href="https://twitter.com/rowan_m">Rowan Merewood</a></td>
</tr>
<tr>
Expand All @@ -55,7 +55,8 @@ <h3 class="light">Day One - April 12<sup>th</sup></h3>
<tr>
<td class="time">16:00</td>
<td><a href="/speakers.html#andy">Anatomy of a Responsive Page Load</a> - <a href="https://twitter.com/andyhume">Andy Hume</a></td>
<td><a href="/speakers.html#robert">Bringing the open web and APIs to mobile devices with Firefox OS</a> - <a href="https://twitter.com/robertnyman">Robert Nyman</a></td>
<td><a href="/speakers.html#phil">Real Time Web Apps in the Wild</a> - <a href="https://twitter.com/leggetter">Phil Leggetter</a></td>

</tr>
<tr>
<td class="time">17:00</td>
Expand Down

0 comments on commit d3168f7

Please sign in to comment.