Differences

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

--- reseda:index [2020/07/16 15:03] – Johanna Jochum
+++ reseda:index [2020/07/16 20:13] – Christian Franz
@@ Line 1: / Line 1: @@
-====== RESEDA ======
+====== Welcome @ RESEDA ======
-Hi and welcome at RESEDA!
+{{:reseda:reseda_test.jpg?nolink&750 |}} \\
-RESEDA team - Johanna, Jon, Christian, Peter, Lukas
+**RESEDA team** - Johanna, Jon, Christian, Andreas, Peter, Lukas
 ----
@@ Line 11: / Line 11: @@
 <WRAP half column round box>
 ===== News =====
-{{ :panda:news_1_.svg?nolink&120}}
-  * Christian Franz left RESEDA, we wish him all the best at PANDA
+{{ :reseda:reseda_logo_small.png?nolink&120|}}
-  *
+  * Christian Franz left RESEDA, we wish him all the best at PANDA/TOPAS
+  * The new sample table from JJ-Xray is being installed
   *
   *
@@ Line 75: / Line 76: @@
 <WRAP half column round box>
 ===== What's happening at RESEDA? =====
-{{ :panda:calculator.svg?nolink&120}}
 {{rss>https://twitter.com/RESEDA_MLZ 5}}
@@ Line 107: / Line 107: @@
   * Christian Franz - https://mlz-garching.de/topas/de
+  * Steffen Säubert - http://www.rosslabcsu.com/people/
   * Thorsten Schröder -
   * Jonas Kindervater -
-  * ...
+  * Maximilian Krautloher -
   *
   *

MLZ - Wiki