Merge branch 'dev-tool-info' into dev

This commit is contained in:
Paulus Schoutsen 2015-11-10 00:25:33 -08:00
commit 0c0ccb361d
2 changed files with 2 additions and 2 deletions

View File

@ -22,7 +22,7 @@ _LOGGER = logging.getLogger(__name__)
FRONTEND_URLS = [
URL_ROOT, '/logbook', '/history', '/map', '/devService', '/devState',
'/devEvent']
'/devEvent', '/devInfo']
STATES_URL = re.compile(r'/states(/([a-zA-Z\._\-0-9/]+)|)')
_FINGERPRINT = re.compile(r'^(\w+)-[a-z0-9]{32}\.(\w+)$', re.IGNORECASE)

@ -1 +1 @@
Subproject commit 6ddc18ba5dc4723b72bf1800665b41ebacc7e30e
Subproject commit a387a597b2ed200ac49c71d9d1bf28567593b536