Commit graph

5 commits

Author SHA1 Message Date
João Batista
7f253fcb0e Merge branch 'master' of https://github.com/FranciscoPinto/cern-summer-webfest
Conflicts:
	js/javascript.js
2012-08-05 12:04:05 +02:00
João Batista
30c1f19b13 Loads the slides (ugly still) 2012-08-05 12:00:11 +02:00
Carsten Burgard
e617b20f9e changed chapter titles 2012-08-05 10:53:04 +02:00
João Batista
6cfc171aeb Pre full text part 2012-08-05 10:29:21 +02:00
João Batista
e1115ca8c7 pre remove boostrap thing 2012-08-04 17:09:24 +02:00