Diff for "TitleKalendar"

Differences between revisions 3 and 221 (spanning 218 versions)

$/!\$ Edit conflict - other version:

Anleitung um Termine im Space abzuhalten. Das Archiv.

$/!\$ Edit conflict - your version:

Anleitung um Termine im Space abzuhalten. Das Archiv.

$/!\$ End of edit conflict

-  ⇤ ← Revision 3 as of 2013-08-29 20:27:13 → 
  Size: 80
  Editor: TomK32
  Comment:
+   ← Revision 221 as of 2016-02-04 19:52:21 → ⇥
  Size: 993
  Editor: mariok
  Comment: corrected ArduinoTag 2016 entry
-Deletions are marked like this.
+Additions are marked like this.
 Line 1:
- * Do 2013-08-29: Jour Fixe / Hacknacht
 * Sa 2013-09-07: not a party, party.
+#acl SysadminGroup:read,write,admin,delete,revert Known:read,write,revert All:read

  * 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]]

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

---- /!\ '''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''' ----