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

57ac6cd7

Commit 57ac6cd7 authored 9 years ago by Paulus Schoutsen

Downloads
- Plain Diff

Merge branch 'extract-entity-picture' into dev

Conflicts:
	homeassistant/components/sensor/steam_online.py

parents 621a6e0e 967a751d

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

homeassistant/components/camera/__init__.py 6 additions, 4 deletions

homeassistant/components/camera/__init__.py
homeassistant/components/device_tracker/__init__.py 6 additions, 4 deletions

homeassistant/components/device_tracker/__init__.py
homeassistant/components/media_player/__init__.py 6 additions, 4 deletions

homeassistant/components/media_player/__init__.py
homeassistant/components/sensor/steam_online.py 4 additions, 6 deletions

homeassistant/components/sensor/steam_online.py
homeassistant/components/sensor/twitch.py 6 additions, 2 deletions

homeassistant/components/sensor/twitch.py
homeassistant/components/sensor/yr.py 10 additions, 10 deletions

homeassistant/components/sensor/yr.py
homeassistant/helpers/entity.py 29 additions, 15 deletions

homeassistant/helpers/entity.py

with 67 additions and 45 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