Merge 4.5

Conflicts:
	js/expand-too-long.js
This commit is contained in:
czaks 2014-06-10 17:51:03 +02:00
commit c2cbbe7e22
4 changed files with 5 additions and 4 deletions

View file

@ -3,6 +3,7 @@
<html>
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width" />
<title>{{ settings.title }}</title>
<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}"/>
</head>