Merge branch 'master' of github.com:phpugms/phpugms.github.io

Author: Timo Tewes

README.md

@@ -7,6 +7,12 @@
 * Contribute Slides and links on [GitHub](https://github.com/phpugms/)
 * Chat with us in the `#phpugms` room on the [PHPUG Slack](https://phpug.slack.com/) (Get your [Invite](https://php.ug/slackinvite))
 
+## Slides 2018
+
+### January 22th 2018
+
+* [Introduction](http://phpugms.github.io/phpugms_greeting_2018-01/index.html)
+* Marcel Thole [GitLab](https://talks.marcelthole.de/toolchains/gitlab.html#/)
 
 ## Slides 2017
 

assets/check24-logo.png

@@ -55,7 +55,7 @@ <h2>
         <br/>
         <a href="https://twitter.com/phpugms">@phpugms</a>
         <br/>
-        Tuesday, Januar 16, 2018
+        Monday, January 22th, 2018
     <p>
 </section>
 
@@ -74,8 +74,6 @@ <h2>
 <section>
     <h2>Slide Archive on Github</h2>
 
-
-
     <p>
         Contribute Slides and links on GitHub<br>
         <a href="https://github.com/phpugms/">github.com/phpugms</a><br>
@@ -86,7 +84,6 @@ <h2>Slide Archive on Github</h2>
 
                 <section>
                     <h1>Wifi</h1>
-                    <p>SSID: GS Event<br>Password: gruenspar4events</p>
                 </section>
 
                 <section>
@@ -102,51 +99,52 @@ <h2>Thank you sponsors!</h2>
 </section>
 
 
-
 <section>
-    <img src="../assets/gruenspar_logo.jpg" class="noborder" />
+    <img src="../assets/check24-logo.png" class="noborder" />
     <p>Thanks for Drinks, Wifi and Hosting</p>
     <p>Looking for a Job? Ask the team!</p>
 </section>
 
 
-                <section>
-                    <img src="../assets/shopware_logo_white_on_blue.png" class="noborder" />
-                    <p class="fragment">jobs.shopware.com</p>
-                </section>
-
-
-
 
 <section>
     <h1>Upcoming Events</h1>
 </section>
 
+                <section>
+                    <h2>PHP.RUHR on Tour in Essen</h2>
+                    <strong>Thursday, February 1, 2018</strong><br>
+
+                <p>Continuous Integration / Continuous Deployment in der Praxis</p>
+                    <p>Mobile Performance-Optimierung einer Web-Applikation</p>
+                    <p>MEHRKANAL GmbH, Essen</p>
+                </section>
+
                 <section class="l-2up">
                     <h2>SoCraMOB Open Space 2018.1</h2>
 
                     <strong>Samstag, Februar 17, 2018</strong><br>
 
-                                        <img src="phpugms_greeting_2018-01/img/socramob-logo.png" alt="SoCraMOB Logo" class="noborder" style="width: 300px">
+                    <img src="./img/socramob-logo.png" alt="SoCraMOB Logo" class="noborder" style="width: 300px">
                     <p>Vectron Systems AG, Willy-Brandt-Weg 41, 48155 Münster</p>
                 </section>
 
 
                 <section class="l-2up">
-                    <h2>November Meeting</h2>
+                    <h2>February Meeting</h2>
 
-                    <strong>Tuesday, Months Day, Year</strong><br>
+                    <p>CITT - Continuous Integration Training und Setup</p>
+                    <strong>Tuesday, February 20, 2018 - 19:00</strong>
 
-                    <p>Speaker Speakerlast (@speaker)</p>
+                    <p>Roland Golla (@nevercodealone)</p>
                 </section>
 
 
 <section>
     <h2>Todays Speaker</h2>
 
     <div>
-        <p>Spaker SpakerLast (@speaker)</p>
-        <img src="img/speaker.jpg">
+        <p>Marcel Thole (Check24)</p>
     </div>
 </section>