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

dbf2f622

Commit dbf2f622 authored 9 years ago by Paulus Schoutsen

Downloads
- Plain Diff

Merge branch 'dev' into pr/156

Conflicts:
	requirements.txt

parents e9c0cb74 66a380dd

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

.coveragerc 1 addition, 0 deletions

.coveragerc
homeassistant/components/media_player/__init__.py 2 additions, 1 deletion

homeassistant/components/media_player/__init__.py
homeassistant/components/media_player/mpd.py 195 additions, 0 deletions

homeassistant/components/media_player/mpd.py
homeassistant/components/thermostat/nest.py 15 additions, 1 deletion

homeassistant/components/thermostat/nest.py
homeassistant/config.py 34 additions, 18 deletions

homeassistant/config.py
homeassistant/helpers/__init__.py 3 additions, 1 deletion

homeassistant/helpers/__init__.py
requirements.txt 22 additions, 19 deletions

requirements.txt

with 272 additions and 40 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