Merge branch 'master' of gitlab.com:delkappa/delkappa

This commit is contained in:
Manos Katsomallos 2017-11-04 18:28:23 +01:00
commit b0fe95855b

28
index.html Executable file → Normal file
View File

@ -5,7 +5,7 @@
<!--[if IE 8 ]><html class="no-js ie ie8" lang="en"> <![endif]--> <!--[if IE 8 ]><html class="no-js ie ie8" lang="en"> <![endif]-->
<!--[if (gte IE 8)|!(IE)]><!--> <!--[if (gte IE 8)|!(IE)]><!-->
<html class="no-js" lang="en"> <!--<![endif]--> <html class="no-js" lang="en"> <!--<![endif]-->
<head> <head>
<!-- <!--
Theme: Ceevee Theme: Ceevee
@ -64,9 +64,9 @@
================================================== --> ================================================== -->
<link rel="shortcut icon" href="images/favicon.ico" > <link rel="shortcut icon" href="images/favicon.ico" >
</head> </head>
<body> <body>
<!-- Header <!-- Header
Photo: Play Among The Stars Photo: Play Among The Stars
By David L. Labrie — National Geographic Your Shot By David L. Labrie — National Geographic Your Shot
@ -267,14 +267,14 @@
<h3>University of Paris-Seine</h3> <h3>University of Paris-Seine</h3>
<p class="info"> <p class="info">
Research &amp; Teaching Assistant<span>&bull;</span> Research &amp; Teaching Assistant<span>&bull;</span>
<em class="date">Oct. 2016 - Present</em> <em class="date">Oct 2016 - Present</em>
</p> </p>
<p style="text-align: justify;"> <p style="text-align: justify;">
<ul> <ul>
<li>Developing Applications for Mobile Devices</li> <li>- Developing Applications for Mobile Devices</li>
<li>Advanced Databases</li> <li>- Advanced Databases</li>
<li>Web Services &amp; Service Oriented Architectures</li> <li>- Web Services &amp; Service Oriented Architectures</li>
<li>Data Integration &amp; Warehouses</li> <li>- Data Integration &amp; Warehouses</li>
</ul> </ul>
</p> </p>
@ -289,7 +289,7 @@
<h3>LET'S GO travel net</h3> <h3>LET'S GO travel net</h3>
<p class="info"> <p class="info">
IT Consultant<span>&bull;</span> IT Consultant<span>&bull;</span>
<em class="date">Oct. 2015 - Sep. 2016</em> <em class="date">Oct 2015 - Sep 2016</em>
</p> </p>
<p style="text-align: justify;"> <p style="text-align: justify;">
@ -307,7 +307,7 @@
<h3>CERN</h3> <h3>CERN</h3>
<p class="info"> <p class="info">
Intern<span>&bull;</span> Intern<span>&bull;</span>
<em class="date">Jul. - Sep. 2015</em> <em class="date">Jul - Sep 2015</em>
</p> </p>
<p style="text-align: justify;"> <p style="text-align: justify;">
@ -325,12 +325,12 @@
<h3>University of Thessaly</h3> <h3>University of Thessaly</h3>
<p class="info"> <p class="info">
Graduate Assistant<span>&bull;</span> Graduate Assistant<span>&bull;</span>
<em class="date">Sep. 2014 - May 2015</em> <em class="date">Sep 2014 - Jun 2015</em>
</p> </p>
<p style="text-align: justify;"> <p style="text-align: justify;">
<ul> <ul>
<li>Concurrent Programming</li> <li>- Concurrent Programming</li>
<li>System Programming</li> <li>- System Programming</li>
</ul> </ul>
</p> </p>
@ -448,7 +448,7 @@
<script src="js/magnific-popup.js"></script> <script src="js/magnific-popup.js"></script>
<script src="js/init.js"></script> <script src="js/init.js"></script>
</body> </body>
</html> </html>
>>>>>>> 0f28386bbab7b52ee21294ea5585484affea8891 >>>>>>> 0f28386bbab7b52ee21294ea5585484affea8891