Skip to content

Commit c7c2229

Browse files
authored
Merge pull request #44 from clojurebridge-berlin/update-website
WIP Add november workshop
2 parents 1f0187e + e481932 commit c7c2229

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

images/clojurebridge_201611.jpg

120 KB
Loading

index.html

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -291,11 +291,9 @@ <h2>Workshops</h2>
291291
<div class="row">
292292
<div class="col-md-6">
293293
<p><strong>Workshop January 2016</strong></p>
294-
<p>The January workshop took place on 22nd and 23rd January in Berlin. We had 32 students and around 20 coaches.</p>
295-
<p><i>Der Workshop im Januar fand am 22. und 23. Januar in Berlin statt. Es gab 32 TeilnehmerInnen und etwa 20 Coaches.</i></p>
296-
<p>Host: <a href="https://www.wunderlist.com/">Wunderlist</a>
297-
<br>Catering: <a href="http://suppen-cult.de">SuppenCult</a> & Cate from <a href="http://atravellingcook.com/">A Travelling Cook</a>
298-
<br>Blogpost: <a href="http://foundation.travis-ci.org/2016/01/28/clojurebridge/">Read about the workshop!</a></p>
294+
<p>The January workshop took place on 22nd and 23rd January in Berlin. We had 32 students and around 20 coaches. <a href="http://foundation.travis-ci.org/2016/01/28/clojurebridge/">Read about the workshop!</a></p>
295+
<p><i>Der Workshop im Januar fand am 22. und 23. Januar in Berlin statt. Es gab 32 TeilnehmerInnen und etwa 20 Coaches. <a href="http://foundation.travis-ci.org/2016/01/28/clojurebridge/">Lies einen Post über den Workshop!</a></i></p>
296+
<p>Catering: <a href="http://suppen-cult.de">SuppenCult</a> & Cate from <a href="http://atravellingcook.com/">A Travelling Cook</a>
299297
</div>
300298
<div class="col-md-6">
301299
<img class="attendees-picture" src="/images/clojurebridge_201601.jpg">
@@ -307,9 +305,8 @@ <h2>Workshops</h2>
307305
<br>
308306
<p>
309307
<strong>Workshop June 2016</strong><br>
310-
The last workshop took place on 17th and 18th June in Berlin. We had 38 students and around 20 coaches.<br>
311-
<i>Der letzte Workshop fand am 17. und 18. Juni in Berlin statt. Es waren 38 TeilnehmerInnen und etwa 20 Coaches dabei.</i><br><br>
312-
Host: <a href="https://www.wunderlist.com/">Wunderlist</a><br>
308+
The Summer workshop took place on 17th and 18th June in Berlin. We had 38 students and around 20 coaches.<br>
309+
<i>Der Sommer Workshop fand am 17. und 18. Juni in Berlin statt. Es waren 38 TeilnehmerInnen und etwa 20 Coaches dabei.</i><br><br>
313310
Catering: Cate from <a href="http://atravellingcook.com/">A Travelling Cook</a>
314311
</p>
315312
</div>
@@ -318,6 +315,20 @@ <h2>Workshops</h2>
318315
</div>
319316
</div>
320317

318+
<div class="row">
319+
<div class="col-md-12">
320+
<br>
321+
<p>
322+
<strong>Workshop November 2016</strong><br>
323+
The last workshop took place on 25th and 26th November in Berlin. We had 38 students and around 23 coaches.<br>
324+
<i>Der letzte Workshop fand am 25. und 26. Juni in Berlin statt. Es waren 38 TeilnehmerInnen und etwa 23 Coaches dabei.</i><br>
325+
</p>
326+
</div>
327+
<div class="col-md-12">
328+
<img class="attendees-picture" src="/images/clojurebridge_201611.jpg">
329+
</div>
330+
</div>
331+
321332
<div class="row supporter-area">
322333
<h2>Sponsors Winter 2016</h2>
323334
<div class="col-md-12 supporter-logos">

0 commit comments

Comments
 (0)