Diff for "TitleKalendar"

Differences between revisions 221 and 278 (spanning 57 versions)

Anleitung um Termine im Space abzuhalten. Das Archiv.

-  ⇤ ← Revision 221 as of 2016-02-04 19:52:21 → 
  Size: 993
  Editor: mariok
  Comment: corrected ArduinoTag 2016 entry
+   ← Revision 278 as of 2016-10-09 12:44:08 → ⇥
  Size: 542
  Editor: mariok
  Comment: added entry 2016-10-22 Spieleabend
-Deletions are marked like this.
+Additions are marked like this.
 Line 3:
-  * 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

---- /!\ '''Edit conflict - other version:''' ----
  * 2016-04-02 ab 11:00 -- [[ArduinoTag/2016]]
+ * Do 2016-10-13 19:00-23:59 -- [[DevLoL/JourFixe/2016-10-13|Jour Fixe]] / Hacknacht
 * Do 2016-10-20 19:00-23:59 -- Hacknacht
 * Sa 2016-10-22 16:00-23:59 -- Spieleabend Pen&Paper Spiel [[https://de.wikipedia.org/wiki/Paranoia_%28Rollenspiel%29|Paranoia]]
 * Mi 2016-11-02 19:00-23:59 -- [[http://www.lugl.at|Linux User Group Linz]] Treffen
-Line 15:
+Line 9:
----- /!\ '''Edit conflict - your version:''' ----
  * 2016-04-02 11:00-openend -- Arduinotag 2016

[[TitleKalendar/Anleitung|Anleitung]] um Termine im Space abzuhalten. Das [[TitleKalendar/Archiv|Archiv]].

---- /!\ '''End of edit conflict''' ----