Browse files

Merge pull request #5 from janmonschke/gh-pages

Adding my talk to the website
  • Loading branch information...
2 parents 34bef4c + 5edabff commit ee32e283ceee270e76f7f9742c1175f5e5ef69ff @rmehner rmehner committed Feb 7, 2012
Showing with 8 additions and 10 deletions.
  1. +8 −10 index.html
@@ -59,17 +59,15 @@ <h3 class="ug-info triangle-border left">
working on using the upcoming standard.
- <div class="speaker empty">
- <h3>Free Slot</h3>
- <h5>This slot could be yours!<br/>Submit your talk now.</h5>
- <p>
- You did some crazy stuff with Javascript? You want to show it to the community?
- Then you should <b>give a talk at Berlin.JS!</b>
- </p>
+ <div class="speaker">
+ <h3>Lightweight client-side development with Brunch</h3>
+ <h5>
+ Jan Monschke
+ <a href="">@thedeftone</a>
+ </h5>
- Drop us a line on your topic as @-reply on <a href="" title="BerlinJS on
- Twitter">Twitter</a> or via the <a href="" title="BerlinJS
- Mailinglist">mailinglist</a>.
+ Jan will show us <a href="">Brunch</a>, a framework
+ that helps developing complex client-side applications using CoffeeScript and Backbone.js.
<div class="speaker empty">

0 comments on commit ee32e28

Please sign in to comment.