fixed merge

This commit is contained in:
Lars van Hijfte
2017-01-11 11:13:04 +01:00
8 changed files with 116 additions and 1 deletions

View File

@@ -1,6 +1,6 @@
<header>
<div id="header-logo">
<img src="img/Logo.png" />
<img src="img/logo.png" />
</div>
<div id="header-search">
<form action="php/search.php" method="get">