Diff for "TitleKalendar"

Differences between revisions 221 and 225 (spanning 4 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 225 as of 2016-02-13 20:36:05 → ⇥
  Size: 554
  Editor: mariok
  Comment: removed old entries
-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-18 19:00-23:59 -- [[DevLoL/JourFixe/2016-02-18|Jour Fixe]] / Hacknacht
-Line 9:
+Line 5:
+  * 2016-02-26 18:00-20:00 -- [[https://wiki.fsfe.org/groups/Linz|Freizeichen (FSFE Gruppe Linz)]]
-Line 10:
+Line 7:
----- /!\ '''Edit conflict - other version:''' ----
  * 2016-04-02 ab 11:00 -- [[ArduinoTag/2016]]

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

---- /!\ '''Edit conflict - your version:''' ----
-Line 20:
+Line 10:
----- /!\ '''End of edit conflict''' ----