Merge branch 'master' into next

This commit is contained in:
Fabian Affolter 2016-07-23 09:32:22 +02:00
commit 6029679a51
No known key found for this signature in database
GPG key ID: DDF3D6F44AAB1336
42 changed files with 341 additions and 196 deletions

View file

@ -15,8 +15,13 @@ hide_github_edit: true
<div class="grid">
<div class="grid__item one-third lap-one-third palm-one-whole">
<div class='current-version material-card text'>
<<<<<<< HEAD
<h1>Current Version: 0.24</h1>
Released: <span class='release-date'>July 16, 2016</span>
=======
<h1>Current Version: 0.24.1</h1>
Released: <span class='release-date'>July 21, 2016</span>
>>>>>>> master
<div class='links'>
<a href='/blog/2016/07/16/sqlalchemy-knx-join-simplisafe/'>Release notes</a>