Differences

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

--- reseda:index [2020/07/16 17:21] – AW test edit awendl
+++ reseda:index [2020/07/17 09:11] – Johanna Jochum
@@ Line 2: / Line 2: @@
 ====== Welcome @ RESEDA ======
-{{ :reseda:reseda_test.jpg?nolink&1200 |}}
+{{:reseda:reseda_test.jpg?nolink&1200 |}} \\
-RESEDA team - Johanna, Jon, Christian, Peter, Lukas
+**RESEDA team** - Johanna, Jon, Christian, Andreas, Peter, Lukas
 ----
@@ Line 77: / Line 77: @@
 <WRAP half column round box>
 ===== What's happening at RESEDA? =====
+<html>
-{{rss>https://twitter.com/RESEDA_MLZ 5}}
+<a class="twitter-timeline" data-width="500" data-height="500" href="https://twitter.com/RESEDA_MLZ?ref_src=twsrc%5Etfw">Tweets by RESEDA_MLZ</a> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
+</html>
 </WRAP>
@@ Line 108: / Line 109: @@
   * Christian Franz - https://mlz-garching.de/topas/de
-  * Thorsten Schröder -
+  * Steffen Säubert - http://www.rosslabcsu.com/people/
-  * Jonas Kindervater -
+  * Thorsten Schröder - Osram
-  * Maximilian Krautloher -
+  * Jonas Kindervater - Carl Zeiss SMT GmbH
-  *
+  * Maximilian Krautloher - Max Planck Institut Stuttgart
-  *
-  *
-  *
 </WRAP>

MLZ - Wiki