From dd6ab79e35ea43ccd6edc812ea9647336636792d Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Tue, 10 May 2016 21:41:53 -0700
Subject: [PATCH] Make AND and OR conditions valid

---
 homeassistant/helpers/config_validation.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/homeassistant/helpers/config_validation.py b/homeassistant/helpers/config_validation.py
index cea7e95ac5a..031ab5227dc 100644
--- a/homeassistant/helpers/config_validation.py
+++ b/homeassistant/helpers/config_validation.py
@@ -369,6 +369,8 @@ CONDITION_SCHEMA = vol.Any(
     TEMPLATE_CONDITION_SCHEMA,
     TIME_CONDITION_SCHEMA,
     ZONE_CONDITION_SCHEMA,
+    AND_CONDITION_SCHEMA,
+    OR_CONDITION_SCHEMA,
 )
 
 _SCRIPT_DELAY_SCHEMA = vol.Schema({