Diff for "TitleKalendar"

Differences between revisions 221 and 311 (spanning 90 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 311 as of 2017-01-23 20:05:41 → ⇥
  Size: 519
  Editor: mariok
  Comment: entries updated
-Deletions are marked like this.
+Additions are marked like this.
 Line 2:
-  * 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 2017-01-26 19:00-23:59 -- Hacknacht
 * Fr 2017-01-27 16:00-17:45 -- [[https://freizeichen.org/|Freizeichen]] aka [[https://wiki.fsfe.org/LocalGroups/Linz|FSFE Fellowship Gruppe Linz]]
 * Mi 2017-02-01 19:00-23:59 -- [[http://www.lugl.at|Linux User Group Linz]] Treffen
 * Sa 2017-04-01 10:00 -- [[ArduinoTag/2017]]
-Line 15:
+Line 8:
----- /!\ '''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''' ----