jeena/home-assistant.github.io
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into next

Browse source 
Conflicts:
	source/_posts/2016-07-16-sqlalchemy-knx-join-simplisafe.markdown
This commit is contained in:
Paulus Schoutsen 2016-07-30 11:29:05 -07:00
commit fb2ea42c88
39 changed files with 736 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/_includes/site/head.html
View file

@ -11,7 +11,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}</title>
<meta name="author" content="{{ site.author }}">
<meta name="author" content="{% if page.author %}{{ page.author }}{% else %}{{ site.author }}{% endif %}">
<meta name="description" content="{{ description | strip_html | condense_spaces | truncate:150 }}">
{% if page.keywords %}<meta name="keywords" content="{{ page.keywords }}">{% endif %}
<meta name="viewport" content="width=device-width">