Skip to content
Snippets Groups Projects
Commit e532484d authored by egon w. stemle's avatar egon w. stemle :robot:
Browse files

Merge branch 'fix-4'

parents 03fef8dc 39ab25bb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 11 additions and 10 deletions
_includes/head.php
+ 11
− 10
View file @ e532484d
...@@ -32,14 +32,15 @@ ...@@ -32,14 +32,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>MERLIN </title> <title>MERLIN</title>
<meta name="Author" content="Verena Lyding, Karin Schöne, Katrin Wisniewski" /> <meta name="Author" content="Verena Lyding, Karin Schöne, Katrin Wisniewski">
<meta name="Publisher" content="European Academy of Bozen/Bolzano" /> <meta name="Publisher" content="European Academy of Bozen/Bolzano">
<link rel="stylesheet" href="css/style.css" type="text/css" /> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" /> <link rel="stylesheet" href="css/style.css" type="text/css">
<link rel='shortlink' href='http://www.merlin-platform.eu' /> <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<script src="//code.jquery.com/jquery-1.8.0.min.js" ></script> <link rel="shortlink" href="https://merlin-platform.eu">
<script type="text/javascript" src="js/jquery.atooltip.js"></script> <script src="//code.jquery.com/jquery-1.8.0.min.js"></script>
<script type="text/javascript" src="js/utils_MERLIN.js"></script> <script type="text/javascript" src="js/jquery.atooltip.js"></script>
<script type="text/javascript" src="js/utils_MERLIN.js"></script>
</head> </head>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment