Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

Core
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

bf0b4536

Commit bf0b4536 authored 9 years ago by Paulus Schoutsen

Downloads
- Plain Diff

Merge branch 'hotfix/state-as-number' into dev

Conflicts:
	homeassistant/const.py
	tests/helpers/test_state.py

parents 00afaac5 d2df485b

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

homeassistant/components/garage_door/wink.py 1 addition, 1 deletion

homeassistant/components/garage_door/wink.py
homeassistant/components/light/wink.py 1 addition, 1 deletion

homeassistant/components/light/wink.py
homeassistant/components/lock/wink.py 1 addition, 1 deletion

homeassistant/components/lock/wink.py
homeassistant/components/sensor/wink.py 1 addition, 1 deletion

homeassistant/components/sensor/wink.py
homeassistant/components/switch/wink.py 1 addition, 1 deletion

homeassistant/components/switch/wink.py
homeassistant/components/wink.py 1 addition, 1 deletion

homeassistant/components/wink.py
homeassistant/core.py 1 addition, 1 deletion

homeassistant/core.py
homeassistant/helpers/state.py 2 additions, 13 deletions

homeassistant/helpers/state.py
requirements_all.txt 1 addition, 1 deletion

requirements_all.txt
tests/components/test_graphite.py 1 addition, 0 deletions

tests/components/test_graphite.py
tests/components/test_statsd.py 3 additions, 2 deletions

tests/components/test_statsd.py
tests/helpers/test_state.py 9 additions, 15 deletions

tests/helpers/test_state.py

with 23 additions and 38 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

Strive to be the person your dogs believe you are