Diff for "TitleKalendar"

Differences between revisions 70 and 222 (spanning 152 versions)

Anleitung um Termine im Space abzuhalten. Das Archiv.

-  ⇤ ← Revision 70 as of 2013-12-13 11:11:31 → 
  Size: 767
  Editor: TomK32
  Comment:
+   ← Revision 222 as of 2016-02-04 19:56:21 → ⇥
  Size: 684
  Editor: mariok
  Comment: conflict removed
-Deletions are marked like this.
+Additions are marked like this.
 Line 2:
-Line 4:
+Line 3:
- * Do 2013-12-12 19:00 [[DevLoL/JourFixe/2013-12-12|Jour Fixe]] / Hacknacht
 * Sa 2013-12-14 18:00 [[Spielabend|Spieleabend: A night in Limbo]]
 * Do 2013-12-19 19:00 Hacknacht
 * Fr 2013-12-20 18:30 FSFE
 * Sa 2013-12-21 16:00 [[events/2013-12-21-christmas-cookie-bakery|/dev/lol christmas cookie bakery]] (IMPORTANT: read the notes)
 * Do 2013-12-26 19:00 [[DevLoL/JourFixe/2013-12-26|Jour Fixe]] / Hacknacht
+  * 2016-02-04 19:00-23:59 -- Hacknacht
  * 2016-02-09 18:30-22:00 -- [[ArduinoUserGroup|Linzer Arduino User Group (Linzer AUG)]]
  * 2016-02-11 19:00-23:59 -- Hacknacht
  * 2016-02-12 17:00-19:00 -- [[https://wiki.fsfe.org/groups/Linz|Freizeichen (FSFE Gruppe Linz)]]
  * 2016-02-18 19:00-23:59 -- Hacknacht
  * 2016-02-25 19:00-23:59 -- Hacknacht
  * 2016-03-02 19:00-22:00 -- [[http://www.lugl.at|Linux User Group Linz]] Treffen
  * 2016-04-02 11:00-openend -- Arduinotag 2016
-Line 12:
+Line 13:
-Abonnieren als [[http://www.google.com/calendar/embed?src=ZXJhbGRvLm9yZ181dWtiZ2YzNTdjOXFvOXFjMGkxZjlsdTFma0Bncm91cC5jYWxlbmRhci5nb29nbGUuY29t|ics]].