Differences

This shows you the differences between two versions of the page.

--- events [2017/01/02 11:02] – marto
+++ events [2017/01/08 23:48] (current) – marto
@@ Line 7: / Line 7: @@
 ===== Upcoming events =====
+Here you can find entries for events which have their own page. If you are running an event please feel free to create a page for it within the events section. Also of interest is this [[events:30dayfeed|page]], listing all events planned within the next 30 days.
+Stay tuned for news of our [[projects:welcome|CNC Build]].
 ===== Past events =====
-Recent special events include [[events:Say Hi to Tux: A Gentle Introduction to Linux|Say Hi to Tux: A Gentle Introduction to Linux]], the [[events:10th Anniversary|10th Anniversary get-together]] and the [[events:MicrocontrollersandEmbedded systems|Microcontrollers and embedded systems]].
+Recent special events include [[events:Say Hi to Tux: A Gentle Introduction to Linux|Say Hi to Tux: A Gentle Introduction to Linux]], the [[events:10th Anniversary|10th Anniversary get-together]] and the [[events:MicrocontrollersandEmbedded systems|Microcontrollers and embedded systems]] hackathon.