Differences

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

--- workshops:main_page [2017-04-05 12:56] – tim
+++ workshops:main_page [2017-04-09 21:30] (current) – Simon
@@ Line 1: / Line 1: @@
-This wiki contains the content for Edinburgh Hacklab's workshops. Please choose your <del>weapon</del> workshop:
+Edinburgh Hacklab's workshops. Please choose your <del>weapon</del> workshop:
-| {{workshops:arduino_logo.png?150x0}}[[arduino_for_the_curious]]| {{workshops:arduino_logo.png?150x0}}[[arduino_to_the_next_level]] |
+|  [[arduino_for_the_curious|{{workshops:arduino_logo.png?150x0}}]] \\ [[arduino_for_the_curious|Arduino for the Curious]]  |  [[arduino_to_the_next_level|{{workshops:arduino_logo.png?150x0}}]] \\ [[arduino_to_the_next_level|Arduino to the Next Level]]  |
+  *  [[arduino_for_the_curious|Arduino for the Curious]]
-  *  [[arduino_for_the_curious]]
+  *  [[arduino_to_the_next_level|Arduino to the Next Level]]
-  *  [[arduino_to_the_next_level]]
+  *  [[extreme_soldering|Extreme Soldering]]
-  *  [[extreme_soldering]]
+  *  [[solder_on|Solder On]]
-  *  [[solder_on]]
-(Automatically exported to Dokuwiki from Mediawiki by [[https://github.com/projectgus/yamdwe|Yamdwe]] on 04/04/17.)