Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dev
Browse files Browse the repository at this point in the history 
Conflicts:
	homeassistant/const.py
  • Loading branch information
@balloob
balloob committed Jun 8, 2016
2 parents 3e09a73 + 6c5efd5 commit 31489a5
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 31489a5

Please sign in to comment.