Merge origin/master

Conflicts:
	www.strolch.li/index.html
This commit is contained in:
Robert von Burg 2014-03-21 23:42:35 +01:00
commit bd815769fd
1 changed files with 2 additions and 1 deletions

View File

@ -9,7 +9,8 @@
<meta name="author" content="">
<link rel="shortcut icon" href="ico/favicon.ico">
<title>Starter Template for Bootstrap</title>
<title>Strolch: Overview</title>
<!-- Bootstrap core CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet">